diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3964e525-8287-4505-8fe4-b3065fd87b9c.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3964e525-8287-4505-8fe4-b3065fd87b9c.vsidx new file mode 100644 index 00000000..cd251cd1 Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3964e525-8287-4505-8fe4-b3065fd87b9c.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6073bfa4-089d-4f49-9e4b-d9de56e9fcc1.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6073bfa4-089d-4f49-9e4b-d9de56e9fcc1.vsidx new file mode 100644 index 00000000..9dd8d284 Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6073bfa4-089d-4f49-9e4b-d9de56e9fcc1.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx deleted file mode 100644 index ddd7b8ea..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx deleted file mode 100644 index ef971f11..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx deleted file mode 100644 index 0d99117d..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a916c122-86f2-4079-8cb9-b812db9ffa33.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a916c122-86f2-4079-8cb9-b812db9ffa33.vsidx new file mode 100644 index 00000000..26d0173d Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a916c122-86f2-4079-8cb9-b812db9ffa33.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo index 3281d579..bb4b42df 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs b/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs index 5a90c643..29ae4812 100644 --- a/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs +++ b/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs @@ -14,21 +14,20 @@ namespace Debug { public static void Main() { - float[] a= new float[10]; - for (int i = 0; i < 10; i++) - { - a[i] = i; - } + int b = A.a; + A.a = 10; - ref float b = ref a[5]; - - float c = 100; - Console.WriteLine(c==b); } + + + } - + public class A + { + public static int a = 10; + } } diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe index 13295269..3caba5ed 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb index 26c77b06..54e66e08 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll index a6a41f08..b23a4c11 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb index b039a3db..4228895a 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache index 50cfa113..c6311794 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe index 13295269..3caba5ed 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb index 26c77b06..54e66e08 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs index 20d42bd8..33fac126 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs @@ -13,16 +13,16 @@ namespace StgSharp.Control { static public partial class Create { - + internal static Pool pool; private static LinkedObject cache; /// /// 创建一个子弹并将其绑定在一个指定的点上 /// - /// - public static void Bullet(Point point) + /// 表示子弹坐标的点 + public static void Bullet(this Pool pool , Point point) { - Pool.bulletContainer.Add(new Bullet(point)); + pool.bulletContainer.Add(new Bullet(point)); } /// @@ -33,7 +33,7 @@ namespace StgSharp.Control /// 终点序号 public static void Bullet(int begin, int end) { - cache = Pool.pointContainer.Ending; + cache = pool.pointContainer.Ending; for (int i = 1; i < begin; i++) { cache--; @@ -41,7 +41,7 @@ namespace StgSharp.Control for (int i = begin; i < end; i++) { cache--; - Pool.bulletContainer.Add(new Bullet(cache as Point)); + pool.bulletContainer.Add(new Bullet(cache as Point)); } } @@ -54,7 +54,7 @@ namespace StgSharp.Control /// public static void Bullet(int order,uint count,float angle) { - cache=Pool.pointContainer.Ending; + cache=pool.pointContainer.Ending; for (int i = 1; i < count; i++) { cache--; @@ -62,8 +62,8 @@ namespace StgSharp.Control for (uint i = 0; i < count; i++) { PointOnCircle p = new PointOnCircle(cache as Circle, angle, i); - Pool.pointContainer.Add(p); - Pool.bulletContainer.Add(new Bullet(p)); + pool.pointContainer.Add(p); + pool.bulletContainer.Add(new Bullet(p)); } } @@ -81,7 +81,7 @@ namespace StgSharp.Control PointCommon p = new PointCommon(beginX, beginY, angle,Pool.tickCounter); p.XVelocity = x; p.YVelocity = y; - Pool.pointContainer.Add(p); + pool.pointContainer.Add(p); } /// @@ -92,7 +92,7 @@ namespace StgSharp.Control public static void Circle(Point c, float r) { Circle o = new Circle(c,r,Pool.tickCounter); - Pool.geometryContainer.Add(o); + pool.geometryContainer.Add(o); } /// @@ -103,7 +103,7 @@ namespace StgSharp.Control public static void Circle(Point c, Point s) { Circle o = new Circle(c, s,Pool.tickCounter); - Pool.geometryContainer.Add(o); + pool.geometryContainer.Add(o); } /// @@ -114,7 +114,7 @@ namespace StgSharp.Control public static void Line(Point b, Point e) { Line l = new Line(b,e); - Pool.geometryContainer.Add(l); + pool.geometryContainer.Add(l); } @@ -137,8 +137,8 @@ namespace StgSharp.Control f[10]=rotateFunc[i]; circle.RadiusFunc = f; o = new PointOnCircle(circle, angles[i],1); - Pool.geometryContainer.Add(circle); - Pool.pointContainer.Add(o); + pool.geometryContainer.Add(circle); + pool.pointContainer.Add(o); } } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Pool.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Pool.cs deleted file mode 100644 index 18cac426..00000000 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Pool.cs +++ /dev/null @@ -1,85 +0,0 @@ -using StgSharp.Entities; -using StgSharp.Geometries; -using StgSharp.Logic; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Runtime.ExceptionServices; -using System.Text; -using System.Threading.Tasks; - -namespace StgSharp.Control -{ - public static class Pool - { - public static Player player; - public static Counter tickCounter - = new Counter(); - - internal static Counter collectCounter - =new Counter(); - internal static Logic.LinkedList topCollector - = new Logic.LinkedList(collectCounter); - internal static Logic.LinkedList bottomCollector - =new Logic.LinkedList(collectCounter); - internal static Logic.LinkedList leftCollector - =new Logic.LinkedList(collectCounter); - internal static Logic.LinkedList rightCollector - = new Logic.LinkedList(collectCounter); - - public static float leftBoarder; - public static float rightBoarder; - public static float topBoarder; - public static float bottomBoarder; - - internal static Bullet bulletCache; - internal static Counter bulletCounter - =new Counter(); - internal static Logic.LinkedList bulletContainer - = new Logic.LinkedList(bulletCounter); - - internal static Entity entityCache; - internal static Counter entityCounter - =new Counter(); - internal static Logic.LinkedList entityContainer - = new Logic.LinkedList(entityCounter); - - internal static Geometries.Geometry geometryCache; - internal static Counter gemoetryCounter - =new Counter(); - internal static Logic.LinkedList geometryContainer - = new Logic.LinkedList(gemoetryCounter); - - internal static Point pointCache; - internal static Counter pointCounter - =new Counter(); - internal static Logic.LinkedList pointContainer - = new Logic.LinkedList(pointCounter); - - static Pool() - { - - } - - - - public static void OnRender() - { - bulletCache = bulletContainer.Heading; - for (; bulletCache!=null;) - { - if (true) - { - - } - } - } - - - - } - - - -} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs new file mode 100644 index 00000000..4394ad7d --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs @@ -0,0 +1,78 @@ +using StgSharp.Entities; +using StgSharp.Geometries; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.ExceptionServices; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Logic +{ + public class Pool + { + public Player player; + public static Counter tickCounter + = new Counter(); + + internal static Counter collectCounter + =new Counter(); + internal Logic.LinkedList topCollector + =new Logic.LinkedList(collectCounter); + internal Logic.LinkedList bottomCollector + =new Logic.LinkedList(collectCounter); + internal Logic.LinkedList leftCollector + =new Logic.LinkedList(collectCounter); + internal Logic.LinkedList rightCollector + =new Logic.LinkedList(collectCounter); + + public float leftBoarder; + public float rightBoarder; + public float topBoarder; + public float bottomBoarder; + + internal Bullet bulletCache; + internal static Counter bulletCounter + =new Counter(); + internal Logic.LinkedList bulletContainer + = new Logic.LinkedList(bulletCounter); + + internal Entity entityCache; + internal static Counter entityCounter + =new Counter(); + internal Logic.LinkedList entityContainer + =new Logic.LinkedList(entityCounter); + + internal Geometries.Geometry geometryCache; + internal static Counter gemoetryCounter + =new Counter(); + internal Logic.LinkedList geometryContainer + =new Logic.LinkedList(gemoetryCounter); + + internal Point pointCache; + internal static Counter pointCounter + =new Counter(); + internal Logic.LinkedList pointContainer + =new Logic.LinkedList(pointCounter); + + public Pool() + { + + } + + + + public void OnRender() + { + + } + + + + } + + + +} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj index a1c54f26..d452fb9e 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj @@ -49,7 +49,7 @@ - + @@ -73,6 +73,7 @@ + diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs index d1666949..e8447632 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs @@ -1,4 +1,5 @@ -using System; +using StgSharp.Logic; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,6 +9,8 @@ namespace StgSharp.UI { public class BattleField { + internal Pool pool; + internal float _leftBoarder; public float LeftBoarder { @@ -35,5 +38,8 @@ namespace StgSharp.UI set { _bottomBoarder = value; } get { return _bottomBoarder; } } + + + } } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Option.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Option.cs index c9a32d0b..8ef1a9f1 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Option.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Option.cs @@ -1,4 +1,5 @@ -using System; +using StgSharp.Logic; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +7,7 @@ using System.Threading.Tasks; namespace StgSharp.UI { - public class Option + public class Option:LinkedObject { public SelectEventHandler selectEventHandler; @@ -28,6 +29,6 @@ namespace StgSharp.UI } - public delegate void SelectEventHandler(); + } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/SelectEventHandler.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/SelectEventHandler.cs new file mode 100644 index 00000000..6aabf798 --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/SelectEventHandler.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.UI +{ + public delegate void SelectEventHandler(); +} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll index a6a41f08..b23a4c11 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb index b039a3db..4228895a 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll index a6a41f08..b23a4c11 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb index b039a3db..4228895a 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb differ