diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/107706e6-ab89-4e33-a10c-43f621fd5913.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/107706e6-ab89-4e33-a10c-43f621fd5913.vsidx new file mode 100644 index 00000000..fa444086 Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/107706e6-ab89-4e33-a10c-43f621fd5913.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6df2d254-db7a-497c-a868-d8920e7eec32.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6df2d254-db7a-497c-a868-d8920e7eec32.vsidx new file mode 100644 index 00000000..4fd868e6 Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6df2d254-db7a-497c-a868-d8920e7eec32.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/92ebee6a-a2e6-4d44-8e3b-a32b173bf7a5.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/92ebee6a-a2e6-4d44-8e3b-a32b173bf7a5.vsidx deleted file mode 100644 index ec04e2e0..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/92ebee6a-a2e6-4d44-8e3b-a32b173bf7a5.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a711a94b-b07e-4c05-a830-a2781ac86056.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a711a94b-b07e-4c05-a830-a2781ac86056.vsidx new file mode 100644 index 00000000..e068634d Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a711a94b-b07e-4c05-a830-a2781ac86056.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/b2085715-9976-42af-bfce-38644920517a.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/b2085715-9976-42af-bfce-38644920517a.vsidx deleted file mode 100644 index 7c4b31fe..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/b2085715-9976-42af-bfce-38644920517a.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/fe4a42be-fd84-4b3b-b425-8400af1a71a0.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/fe4a42be-fd84-4b3b-b425-8400af1a71a0.vsidx deleted file mode 100644 index 9db4e374..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/fe4a42be-fd84-4b3b-b425-8400af1a71a0.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo index 524b12ba..1b8eae07 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 860d40ad..bbcdd4ab 100644 --- a/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs +++ b/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs @@ -1,6 +1,7 @@ using OpenTK; using StgSharp; using StgSharp.Geometries; +using StgSharp.Logic; using System; using System.Collections.Generic; using System.Data; @@ -14,34 +15,19 @@ namespace Debug { public static void Main() { - A a=new A(); + OperationHandler operationHandler = new OperationHandler(cw); + + for (int i = 0; i < 10; i++) + { + operationHandler.Invoke(i); + } + } - - - } - - public class A - { - public static int a = 10; - public int b = 10; - } - - static class b - { - public static void change(this A a, int b) + public static void cw(int x) { - a.b = b; + Console.WriteLine(x); } + public delegate void OperationHandler(int x); } - - static class c - { - public static void change(this A a, int b) - { - a.b = b++; - } - } - - } diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe index 3caba5ed..7f0fea99 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 54e66e08..fc51d587 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 b23a4c11..5bb6fe16 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 4228895a..52950747 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 c6311794..e84032a7 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 3caba5ed..7f0fea99 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 54e66e08..fc51d587 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/Geometries/ComplexOperationHandler.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/ComplexOperationHandler.cs similarity index 85% rename from 源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/ComplexOperationHandler.cs rename to 源代码/.Net Framework/Stg_Sharp/Stg_Sharp/ComplexOperationHandler.cs index f9768418..d5726571 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/ComplexOperationHandler.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/ComplexOperationHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace StgSharp.Geometries +namespace StgSharp { public delegate void ComplexOperationHandler(); } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs index 33fac126..09d3accf 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs @@ -13,16 +13,13 @@ namespace StgSharp.Control { static public partial class Create { - internal static Pool pool; - private static LinkedObject cache; - /// /// 创建一个子弹并将其绑定在一个指定的点上 /// /// 表示子弹坐标的点 - public static void Bullet(this Pool pool , Point point) + public static void Bullet(Point point) { - pool.bulletContainer.Add(new Bullet(point)); + TimeLine.pool.bulletContainer.Add(new Bullet(point)); } /// @@ -33,7 +30,7 @@ namespace StgSharp.Control /// 终点序号 public static void Bullet(int begin, int end) { - cache = pool.pointContainer.Ending; + LinkedObject cache = TimeLine.pool.pointContainer.Ending; for (int i = 1; i < begin; i++) { cache--; @@ -41,7 +38,7 @@ namespace StgSharp.Control for (int i = begin; i < end; i++) { cache--; - pool.bulletContainer.Add(new Bullet(cache as Point)); + TimeLine.pool.bulletContainer.Add(new Bullet(cache as Point)); } } @@ -54,7 +51,7 @@ namespace StgSharp.Control /// public static void Bullet(int order,uint count,float angle) { - cache=pool.pointContainer.Ending; + LinkedObject cache=TimeLine.pool.pointContainer.Ending; for (int i = 1; i < count; i++) { cache--; @@ -62,8 +59,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)); + TimeLine.pool.pointContainer.Add(p); + TimeLine.pool.bulletContainer.Add(new Bullet(p)); } } @@ -78,10 +75,23 @@ namespace StgSharp.Control /// public static void Point(float beginX,float beginY,float angle,float[] x, float[] y) { - PointCommon p = new PointCommon(beginX, beginY, angle,Pool.tickCounter); + PointCommon p = new PointCommon(beginX, beginY, angle,TimeLine.tickCounter); p.XVelocity = x; p.YVelocity = y; - pool.pointContainer.Add(p); + TimeLine.pool.pointContainer.Add(p); + } + + /// + /// 快速创建一个不需要移动的点 + /// + /// 横坐标 + /// 纵坐标 + public static void Point(float beginX, float beginY) + { + Point point = new Point(); + point.X = beginX; + point.Y = beginY; + TimeLine.pool.pointContainer.Add(point); } /// @@ -91,8 +101,8 @@ namespace StgSharp.Control /// public static void Circle(Point c, float r) { - Circle o = new Circle(c,r,Pool.tickCounter); - pool.geometryContainer.Add(o); + Circle o = new Circle(c,r,TimeLine.tickCounter); + TimeLine.pool.geometryContainer.Add(o); } /// @@ -102,8 +112,8 @@ namespace StgSharp.Control /// public static void Circle(Point c, Point s) { - Circle o = new Circle(c, s,Pool.tickCounter); - pool.geometryContainer.Add(o); + Circle o = new Circle(c, s,TimeLine.tickCounter); + TimeLine.pool.geometryContainer.Add(o); } /// @@ -114,7 +124,7 @@ namespace StgSharp.Control public static void Line(Point b, Point e) { Line l = new Line(b,e); - pool.geometryContainer.Add(l); + TimeLine.pool.geometryContainer.Add(l); } @@ -132,13 +142,13 @@ namespace StgSharp.Control int length = radiuses.Length; for (int i = 0; i operation ) + public static Point Point(this Pool pool,SelectOperation operation ) { - pointCache = Pool.pointContainer.Heading; + Point pointCache = pool.pointContainer.Heading; for (; pointCache!= null; ) { if (operation.Invoke(pointCache)) @@ -33,9 +27,15 @@ namespace StgSharp.Control return null; } - public static Bullet Bullet(SelectOperation operation) + public static void Point() { - bulletCache = Pool.bulletContainer.Heading; + + } + + public static Bullet Bullet(this Pool pool, SelectOperation operation) + { + Bullet bulletCache ; + bulletCache = pool.bulletContainer.Heading; for (; bulletCache != null; ) { if (operation.Invoke(bulletCache)) @@ -47,38 +47,41 @@ namespace StgSharp.Control return bulletCache; } - public static Circle Circle(SelectOperation operation) + public static Circle Circle( this Pool pool, SelectOperation operation) { - geometryCache = Pool.geometryContainer.Heading; - for (; geometryCache != null ; ) + Geometry geomCache; + geomCache = pool.geometryContainer.Heading; + for (; geomCache != null ; ) { - if (geometryCache is Circle && operation.Invoke(geometryCache as Circle)) + if (geomCache is Circle && operation.Invoke(geomCache as Circle)) { break; } - geometryCache++; + geomCache++; } - return geometryCache as Circle; + return geomCache as Circle; } - public static Line Line(SelectOperation operation) + public static Line Line(this Pool pool, SelectOperation operation) { - geometryCache= Pool.geometryContainer.Heading; - for (; geometryCache != null ; ) + Geometry geomCache; + geomCache= pool.geometryContainer.Heading; + for (; geomCache != null ; ) { - if (geometryCache is Line && operation.Invoke(geometryCache as Line)) + if (geomCache is Line && operation.Invoke(geomCache as Line)) { break; } - geometryCache++; + geomCache++; } - return geometryCache as Line; + return geomCache as Line; } - public static Enemy Enemy(SelectOperation operation) + public static Enemy Enemy(this Pool pool, SelectOperation operation) { - enemyCache= Pool.entityContainer.Heading ; + Entity enemyCache; + enemyCache= pool.entityContainer.Heading ; for (; enemyCache != null ; ) { if (enemyCache is Enemy && operation.Invoke(enemyCache as Enemy )) @@ -90,6 +93,5 @@ namespace StgSharp.Control return enemyCache as Enemy; } - } } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt deleted file mode 100644 index a4215492..00000000 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt +++ /dev/null @@ -1 +0,0 @@ -20221029未完成:内置的池初始化与控制 \ No newline at end of file diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TimeLine.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TimeLine.cs new file mode 100644 index 00000000..19d7a9f8 --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TimeLine.cs @@ -0,0 +1,33 @@ +using StgSharp.Logic; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Control +{ + public static class TimeLine + { + public static Pool pool; + public static List poolList; + + public static ComplexOperationHandler complexOperationHandler; + + public static Counter tickCounter; + + public static void OnRender() + { + foreach (Pool pool in poolList) + { + TimeLine.pool = pool; + complexOperationHandler.Invoke(); + + } + + } + + + + } +} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/FreeCurve.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/FreeCurve.cs index 4058b664..2a2c66e4 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/FreeCurve.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/FreeCurve.cs @@ -19,10 +19,6 @@ namespace StgSharp.Geometries set { _center = value; } } - public event ComplexOperationHandler ComplexOperation; - - - public FreeCurve(Point c, float[] x, float[] y) { if (x.Length==10) diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/Point.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/Point.cs index d8577ace..d39d98fc 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/Point.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Geometries/Point.cs @@ -13,7 +13,8 @@ namespace StgSharp.Geometries internal float _y; internal float _angle; - + internal float vX; + internal float vY; public float X { diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs index 4394ad7d..d2122860 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Pool.cs @@ -14,8 +14,6 @@ namespace StgSharp.Logic public class Pool { public Player player; - public static Counter tickCounter - = new Counter(); internal static Counter collectCounter =new Counter(); @@ -28,10 +26,10 @@ namespace StgSharp.Logic internal Logic.LinkedList rightCollector =new Logic.LinkedList(collectCounter); - public float leftBoarder; - public float rightBoarder; - public float topBoarder; - public float bottomBoarder; + public Reflector leftBoarder; + public Reflector rightBoarder; + public Reflector topBoarder; + public Reflector bottomBoarder; internal Bullet bulletCache; internal static Counter bulletCounter @@ -62,14 +60,6 @@ namespace StgSharp.Logic } - - - public void OnRender() - { - - } - - } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Reflector.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Reflector.cs new file mode 100644 index 00000000..c99050ef --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Reflector.cs @@ -0,0 +1,70 @@ +using StgSharp.Control; +using StgSharp.Entities; +using StgSharp.Geometries; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Logic +{ + public class Reflector + { + internal Point _begin; + public Point Begin + { + get { return _begin; } + } + + internal float vecX; + internal float vecY; + + /// + /// 反射器是一个直线形无纹理实体, + /// 与反射器发生碰撞的实体将被执行对应的操作。 + /// 反射器可以通过起点坐标和方向矢量定义。 + /// + /// 起点横坐标 + /// 起点纵坐标 + /// 方向矢量X分量 + /// 方向矢量Y分量 + public Reflector(float beginX, float beginY,float vecX,float vecY) + { + Control.Create.Point(beginX,beginY); + this._begin = TimeLine.pool.pointContainer.Ending; + this.vecX = vecX; + this.vecY = vecY; + } + + + public Reflector(Point begin, Point end) + { + _begin = begin; + vecX = end.X; + vecY = end.Y; + } + + /// + /// 检查某个点穿过反射器的方向, + /// 以反射器正方向向上时定义 + /// + /// 被检查的点 + /// + public bool IsPointLeft(Point point) + { + return + vecX * point.vY+vecY*point.vX>0; + } + + /// + /// 检测 + /// + /// + /// + public bool? IsBulletLeft(Bullet bullet) + { + } + + } +} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Properties/AssemblyInfo.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Properties/AssemblyInfo.cs index 110be793..e79307e4 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Properties/AssemblyInfo.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Stg_Sharp")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Nitload_Space")] [assembly: AssemblyProduct("Stg_Sharp")] -[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyCopyright("Copyright © Nitload_Space 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj index d452fb9e..e3062070 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj @@ -46,9 +46,11 @@ + + @@ -56,7 +58,7 @@ - + @@ -73,11 +75,11 @@ + - diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj.user b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj.user new file mode 100644 index 00000000..c10e84ba --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj.user @@ -0,0 +1,6 @@ + + + + ProjectFiles + + \ No newline at end of file diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Background.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Background.cs new file mode 100644 index 00000000..2a70ce47 --- /dev/null +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/Background.cs @@ -0,0 +1,14 @@ +using StgSharp.Logic; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.UI +{ + public class Background + { + + } +} diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs index e8447632..0a6c04fa 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/UI/BattleField.cs @@ -39,7 +39,10 @@ namespace StgSharp.UI get { return _bottomBoarder; } } - + public BattleField() + { + pool = new Pool(); + } } } 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 b23a4c11..5bb6fe16 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 4228895a..52950747 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/DesignTimeResolveAssemblyReferencesInput.cache b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 040900f6..cae8a117 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache index dc830c75..92eebdd4 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -78a3e5543c41d207f29c2854071e8291080d2b4f +cae813d95901df120cf6341acd23090873717337 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 b23a4c11..5bb6fe16 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 4228895a..52950747 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