diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/3e6c9519-a0ce-4ec3-97dc-4cb150836c71.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/3e6c9519-a0ce-4ec3-97dc-4cb150836c71.vsidx deleted file mode 100644 index b21308b3..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/3e6c9519-a0ce-4ec3-97dc-4cb150836c71.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/43cf5c34-dc00-4eb7-9b59-bb77cebd4847.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/43cf5c34-dc00-4eb7-9b59-bb77cebd4847.vsidx deleted file mode 100644 index 94c314b9..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/43cf5c34-dc00-4eb7-9b59-bb77cebd4847.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d5c80a6-30d8-4d35-841f-0c09ee55c8b2.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d5c80a6-30d8-4d35-841f-0c09ee55c8b2.vsidx new file mode 100644 index 00000000..bfebb4b5 Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d5c80a6-30d8-4d35-841f-0c09ee55c8b2.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d819ec5-d4da-4986-bcd1-5230e0fe3446.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d819ec5-d4da-4986-bcd1-5230e0fe3446.vsidx new file mode 100644 index 00000000..964dad56 Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/4d819ec5-d4da-4986-bcd1-5230e0fe3446.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/b4bb1843-7def-482b-b253-f8f52f27faed.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/b4bb1843-7def-482b-b253-f8f52f27faed.vsidx deleted file mode 100644 index e6d9ea45..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/b4bb1843-7def-482b-b253-f8f52f27faed.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/c36d0b61-b293-475d-a299-e6498cae9d81.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/c36d0b61-b293-475d-a299-e6498cae9d81.vsidx new file mode 100644 index 00000000..0ab0fd00 Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/c36d0b61-b293-475d-a299-e6498cae9d81.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo b/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo index 14c88214..e60d82c7 100644 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo differ diff --git a/源代码/.Net Framework/StgSharp/Game/Properties/AssemblyInfo.cs b/源代码/.Net Framework/StgSharp/Game/Properties/AssemblyInfo.cs index 39633b9a..254c2b77 100644 --- a/源代码/.Net Framework/StgSharp/Game/Properties/AssemblyInfo.cs +++ b/源代码/.Net Framework/StgSharp/Game/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("Game")] +[assembly: AssemblyTitle("StgSharp_Game")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Game")] +[assembly: AssemblyProduct("StgSharp_Game")] [assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj b/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj index c9ac18c7..0258c774 100644 --- a/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj +++ b/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj @@ -7,8 +7,8 @@ {57017F07-7412-4B61-B912-B1D36C3AF16F} Library Properties - Game - Game + StgSharp_Game + StgSharp_Game v4.7.2 512 true diff --git a/源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.dll b/源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.dll deleted file mode 100644 index de543174..00000000 Binary files a/源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.dll and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.dll b/源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.dll new file mode 100644 index 00000000..2389447c Binary files /dev/null and b/源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.pdb b/源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.pdb similarity index 88% rename from 源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.pdb rename to 源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.pdb index 76b910d5..b6bb459f 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.pdb and b/源代码/.Net Framework/StgSharp/Game/bin/Debug/StgSharp_Game.pdb differ diff --git a/源代码/.Net Framework/StgSharp/Game/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/源代码/.Net Framework/StgSharp/Game/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8e0f2822..ca216b0a 100644 Binary files a/源代码/.Net Framework/StgSharp/Game/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/源代码/.Net Framework/StgSharp/Game/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.dll b/源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.dll deleted file mode 100644 index de543174..00000000 Binary files a/源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.dll and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.csproj.FileListAbsolute.txt b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.csproj.FileListAbsolute.txt index fef3f4f3..a7dd7d2f 100644 --- a/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.csproj.FileListAbsolute.txt +++ b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.csproj.FileListAbsolute.txt @@ -1,10 +1,10 @@ -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\Game.dll -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\Game.pdb D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\OpenTK.dll D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\OpenTK.pdb D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\OpenTK.xml D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\StgSharp_Game.csproj.AssemblyReference.cache D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\StgSharp_Game.csproj.CoreCompileInputs.cache D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\StgSharp_Game.csproj.CopyComplete -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\Game.dll -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\Game.pdb +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\StgSharp_Game.dll +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\bin\Debug\StgSharp_Game.pdb +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\StgSharp_Game.dll +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\Game\obj\Debug\StgSharp_Game.pdb diff --git a/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.dll b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.dll new file mode 100644 index 00000000..2389447c Binary files /dev/null and b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.dll differ diff --git a/源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.pdb b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.pdb similarity index 88% rename from 源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.pdb rename to 源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.pdb index 76b910d5..b6bb459f 100644 Binary files a/源代码/.Net Framework/StgSharp/Game/bin/Debug/Game.pdb and b/源代码/.Net Framework/StgSharp/Game/obj/Debug/StgSharp_Game.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.exe b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.exe index 69bdfa0f..7b25ad6a 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.exe and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.exe differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.pdb b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.pdb index 338cc544..56db64f4 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.pdb and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.dll b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.dll index ddb5f4fc..e1bd7dbd 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.dll and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.pdb b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.pdb index 0426f8bf..91af6e09 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.pdb and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Entity.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.dll b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.dll index 6651a093..57d0fda7 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.dll and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.pdb b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.pdb index 10d78057..db5620c0 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.pdb and b/源代码/.Net Framework/StgSharp/StgSharp/bin/Debug/StgSharp_Logic.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/debug.cs b/源代码/.Net Framework/StgSharp/StgSharp/debug.cs index f40f2e3e..5c90e5bd 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp/debug.cs +++ b/源代码/.Net Framework/StgSharp/StgSharp/debug.cs @@ -1,4 +1,7 @@ -using StgSharp_Entity; + +using OpenTK; +using OpenTK.Input; +using StgSharp_Entity; using StgSharp_Logic; using System; using System.Collections.Generic; @@ -24,6 +27,8 @@ namespace StgSharp container.Add(new Bullet()); } container.ReportCapacity(); + + Console.WriteLine(Key.A.ToString()); } } } diff --git a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.csproj.AssemblyReference.cache b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.csproj.AssemblyReference.cache index d134c2e1..d786e900 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.csproj.AssemblyReference.cache and b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.exe b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.exe index 69bdfa0f..7b25ad6a 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.exe and b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.exe differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.pdb b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.pdb index 338cc544..56db64f4 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.pdb and b/源代码/.Net Framework/StgSharp/StgSharp/obj/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/Bullet.cs b/源代码/.Net Framework/StgSharp/StgSharp_Entity/Bullet.cs index 02034877..4beeb49c 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Entity/Bullet.cs +++ b/源代码/.Net Framework/StgSharp/StgSharp_Entity/Bullet.cs @@ -137,9 +137,35 @@ namespace StgSharp_Entity { } - public void ChangeVelocity() + /// + /// 修改自身路径，修改条件由外部逻辑判断触发 + /// + public void ChangeVelocity(float[] newXSpeed,float[] newYSpeed) { - + if (newXSpeed != null) + { + if (newXSpeed.Length == 10) + { + this._xVelocity = newXSpeed; + } + else + { + throw new Exception("The amount of parameters should be 10!"); + } + } + if (newYSpeed != null) + { + if (newYSpeed.Length == 10) + { + this._yVelocity = newYSpeed; + } + else + { + throw new Exception("The amount of parameters should be 10!"); + } + } } + + } } diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/Player.cs b/源代码/.Net Framework/StgSharp/StgSharp_Entity/Player.cs new file mode 100644 index 00000000..d27e0298 --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp_Entity/Player.cs @@ -0,0 +1,181 @@ +using OpenTK; +using OpenTK.Input; +using StgSharp_Entity; +using StgSharp_Logic; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp_Entity +{ + internal class Player:LinkedTarget + { + private uint gameTick; + private uint beginTick; + + private readonly float _velocityHigh; + private readonly float _vHighCorner; + + public float VelocityHigh + { + get { return _velocityHigh; } + } + + private readonly float _velocityLow; + private readonly float _vLowCorner; + + public float VelocityLow + { + get { return _velocityLow; } + } + + private float _xLocation; + + public float XLocation + { + get { return _xLocation; } + set { _xLocation = value; } + } + + public float _yLocation; + public float YLocation + { + get { return _yLocation; } + set { _yLocation = value; } + } + + private KeyboardState _keyboardState; + + public KeyboardState KeyboardState + { + get { return _keyboardState; } + set { _keyboardState = value; } + } + + + public Player(float velocityHigh,float velocityLow,KeyboardState keyboardState) + { + this._velocityHigh = velocityHigh; + this._vHighCorner = velocityHigh / 1.4142136f; + this._velocityLow = velocityLow; + this._vLowCorner = velocityLow / 1.4142136f; + this._keyboardState = keyboardState; + } + + + + public void Action() + { + if (_keyboardState.IsAnyKeyDown) + { + Move(); + + } + } + + /// + /// 自机移动的简单方法 + /// + public void Move() + { + if (_keyboardState.IsKeyDown(Key.ShiftLeft)) + { + if (_keyboardState.IsKeyDown(Key.Up)) + { + if (_keyboardState.IsKeyDown(Key.Left)) + { + this._yLocation += _vLowCorner; + this._xLocation -= _vLowCorner; + } + else if (_keyboardState.IsKeyDown(Key.Right)) + { + this._yLocation += _vLowCorner; + this._xLocation += _vLowCorner; + } + else + { + this._yLocation += _velocityLow; + } + } + else if (_keyboardState.IsKeyDown(Key.Down)) + { + if (_keyboardState.IsKeyDown(Key.Left)) + { + this._yLocation -= _vLowCorner; + this._xLocation -= _vLowCorner; + } + else if (_keyboardState.IsKeyDown(Key.Right)) + { + this._yLocation -= _vLowCorner; + this._xLocation += _vLowCorner; + } + else + { + this._yLocation -= _velocityLow; + } + + } + } + else + { + if (_keyboardState.IsKeyDown(Key.Up)) + { + if (_keyboardState.IsKeyDown(Key.Left)) + { + this._yLocation += _vHighCorner; + this._xLocation -= _vHighCorner; + } + else if (_keyboardState.IsKeyDown(Key.Right)) + { + this._yLocation += _vHighCorner; + this._xLocation += _vHighCorner; + } + else + { + this._yLocation += _velocityHigh; + } + } + else if (_keyboardState.IsKeyDown(Key.Down)) + { + if (_keyboardState.IsKeyDown(Key.Left)) + { + this._yLocation -= _vHighCorner; + this._xLocation -= _vHighCorner; + } + else if (_keyboardState.IsKeyDown(Key.Right)) + { + this._yLocation -= _vHighCorner; + this._xLocation += _vHighCorner; + } + else + { + this._yLocation -= _velocityHigh; + } + + } + + } + } + + public void UseSkill(KeyboardState key) + { + if (key.IsKeyDown(Key.X)) + { + + } + } + + public void LaunchBullet(KeyboardState key) + { + + } + + public void Die() + { + + } + } +} diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj b/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj index bc2e091c..cc83e138 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj +++ b/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj @@ -45,6 +45,7 @@ + diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.dll b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.dll index ddb5f4fc..e1bd7dbd 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.dll and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.pdb index 0426f8bf..91af6e09 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Entity.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.dll b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.dll index 6651a093..57d0fda7 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.dll and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.pdb index 10d78057..db5620c0 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/bin/Debug/StgSharp_Logic.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.AssemblyReference.cache b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.AssemblyReference.cache index 9abc6330..05458796 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.AssemblyReference.cache and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.CoreCompileInputs.cache b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.CoreCompileInputs.cache index ae8afa44..f1291fcd 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.CoreCompileInputs.cache +++ b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9f3d72d61544f629ca17662eb1b4507364353c8b +2d5905d44084acf7b24064935643d53ef7c88707 diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.dll b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.dll index ddb5f4fc..e1bd7dbd 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.dll and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.pdb index 0426f8bf..91af6e09 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Entity/obj/Debug/StgSharp_Entity.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedList.cs b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedList.cs index 5579783d..f8719c16 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedList.cs +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedList.cs @@ -108,7 +108,7 @@ namespace StgSharp_Logic if (_cache==target) { Remove(target); - a = true; + a = false; _amountCounter.Value--; } } diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs index 139ec462..d0e2ecf7 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs @@ -14,7 +14,7 @@ namespace StgSharp_Logic { get { return _previous; } set { - //if (this.GetType().FullName == value.GetType().FullName) + if (value==null||this.GetType().FullName == value.GetType().FullName) { _previous = value; } @@ -27,7 +27,7 @@ namespace StgSharp_Logic { get { return _next; } set { - //if (this.GetType().FullName==value.GetType().FullName) + if (value == null || this.GetType().FullName==value.GetType().FullName) { _next = value; } diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.dll b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.dll deleted file mode 100644 index de543174..00000000 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/Game.dll and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.dll b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.dll new file mode 100644 index 00000000..2389447c Binary files /dev/null and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.dll differ diff --git a/源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.pdb similarity index 88% rename from 源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.pdb rename to 源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.pdb index 76b910d5..b6bb459f 100644 Binary files a/源代码/.Net Framework/StgSharp/Game/obj/Debug/Game.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Game.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.dll b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.dll index 6651a093..57d0fda7 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.dll and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.pdb index 10d78057..db5620c0 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/bin/Debug/StgSharp_Logic.pdb differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.AssemblyReference.cache b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.AssemblyReference.cache index 6ad92668..2bc261cb 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.AssemblyReference.cache and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.CoreCompileInputs.cache b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.CoreCompileInputs.cache index 3c0af8d1..5845ef58 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.CoreCompileInputs.cache +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -84e8b54631a157cd484f38b0f77768efef40e58b +db769c63e34adb286b6eefdc1550008efc594664 diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.FileListAbsolute.txt b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.FileListAbsolute.txt index 19026b43..51f99036 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.FileListAbsolute.txt +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.csproj.FileListAbsolute.txt @@ -1,8 +1,6 @@ D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\StgSharp_Logic.dll D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\StgSharp_Logic.pdb -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\Game.dll D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\OpenTK.dll -D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\Game.pdb D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\OpenTK.pdb D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\OpenTK.xml D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\obj\Debug\StgSharp_Logic.csproj.AssemblyReference.cache @@ -10,3 +8,5 @@ D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Fra D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\obj\Debug\StgSharp_Logic.csproj.CopyComplete D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\obj\Debug\StgSharp_Logic.dll D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\obj\Debug\StgSharp_Logic.pdb +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\StgSharp_Game.dll +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net Framework\STGSharp\StgSharp_Logic\bin\Debug\StgSharp_Game.pdb diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.dll b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.dll index 6651a093..57d0fda7 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.dll and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.dll differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.pdb b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.pdb index 10d78057..db5620c0 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.pdb and b/源代码/.Net Framework/StgSharp/StgSharp_Logic/obj/Debug/StgSharp_Logic.pdb differ