Skip to content

Commit 6fcc325

Browse files
lr8softlr8soft
authored
Merge pull request #26 from lr8soft/dev-y
v0.31x
2 parents ebd8390 + a7c3741 commit 6fcc325

76 files changed

Lines changed: 1459 additions & 262 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/PySTG.iml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml‎

Lines changed: 32 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PythonSTG/LaunchHelper.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ void LaunchHelper::StartGame()
2626

2727
void LaunchHelper::StartConfigHelper()
2828
{
29+
system("PythonSTGConfig.exe");
2930
}
3031

3132
void LaunchHelper::LoadGameMenu()

‎PythonSTG/PythonSTG.aps‎

6.95 KB
Binary file not shown.

‎PythonSTG/PythonSTG.rc‎

4.99 KB
Binary file not shown.

‎PythonSTG/PythonSTG.vcxproj‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<AdditionalIncludeDirectories>C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8181
<UseUnicodeForAssemblerListing>
8282
</UseUnicodeForAssemblerListing>
83+
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
8384
</ClCompile>
8485
<Link>
8586
<AdditionalDependencies>glfw3.lib;freetype.lib;..\libs\x86\OpenAL32.lib;..\libs\x86\python36.lib;..\libs\x86\python36_d.lib;..\libs\x86\python3.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -145,6 +146,10 @@
145146
<ClCompile Include="XCCore\Background\Camera.cpp" />
146147
<ClCompile Include="XCCore\Background\Lake.cpp" />
147148
<ClCompile Include="XCCore\Background\MagicForest.cpp" />
149+
<ClCompile Include="XCCore\Boss\Boss.cpp" />
150+
<ClCompile Include="XCCore\Boss\BossHelper.cpp" />
151+
<ClCompile Include="XCCore\Boss\BossObject.cpp" />
152+
<ClCompile Include="XCCore\Boss\SpellCard.cpp" />
148153
<ClCompile Include="XCCore\Bullet\BulletHelper.cpp" />
149154
<ClCompile Include="XCCore\Bullet\CircleTypeBullet.cpp" />
150155
<ClCompile Include="XCCore\Bullet\OvalTypeBullet.cpp" />
@@ -153,11 +158,11 @@
153158
<ClCompile Include="XCCore\Menu\GameMenu.cpp" />
154159
<ClCompile Include="XCCore\Menu\PauseMenu.cpp" />
155160
<ClCompile Include="XCCore\Task\Task.cpp" />
156-
<ClCompile Include="XCCore\Task\TaskBoss.cpp" />
157161
<ClCompile Include="XCCore\Task\TaskDispatcher.cpp" />
158162
<ClCompile Include="XCCore\Task\TaskHelper.cpp" />
159163
<ClCompile Include="XCCore\Task\TaskEnemy.cpp" />
160164
<ClCompile Include="XCCore\Task\TaskInsideUnit.cpp" />
165+
<ClCompile Include="XCCore\UserInterface\BossInfoInterface.cpp" />
161166
<ClCompile Include="XCCore\UserInterface\CoverInterface.cpp" />
162167
<ClCompile Include="XCCore\UserInterface\GameInfoInterface.cpp" />
163168
<ClCompile Include="XCCore\XCAudio\AudioHelper.cpp" />
@@ -184,6 +189,12 @@
184189
</ItemGroup>
185190
<ItemGroup>
186191
<ClInclude Include="LaunchHelper.h" />
192+
<ClInclude Include="resource.h" />
193+
<ClInclude Include="resource1.h" />
194+
<ClInclude Include="XCCore\Boss\Boss.h" />
195+
<ClInclude Include="XCCore\Boss\BossHelper.h" />
196+
<ClInclude Include="XCCore\Boss\BossObject.h" />
197+
<ClInclude Include="XCCore\Boss\SpellCard.h" />
187198
<ClInclude Include="XCCore\Bullet\OvalTypeBullet.h" />
188199
<ClInclude Include="XCCore\Menu\PauseMenu.h" />
189200
<ClInclude Include="util\ConfigManager.h" />
@@ -206,11 +217,11 @@
206217
<ClInclude Include="XCCore\Menu\GameMenu.h" />
207218
<ClInclude Include="XCCore\Menu\IMenu.h" />
208219
<ClInclude Include="XCCore\Task\Task.h" />
209-
<ClInclude Include="XCCore\Task\TaskBoss.h" />
210220
<ClInclude Include="XCCore\Task\TaskDispatcher.h" />
211221
<ClInclude Include="XCCore\Task\TaskHelper.h" />
212222
<ClInclude Include="XCCore\Task\TaskEnemy.h" />
213223
<ClInclude Include="XCCore\Task\TaskInsideUnit.h" />
224+
<ClInclude Include="XCCore\UserInterface\BossInfoInterface.h" />
214225
<ClInclude Include="XCCore\UserInterface\CoverInterface.h" />
215226
<ClInclude Include="XCCore\UserInterface\GameInfoInterface.h" />
216227
<ClInclude Include="XCCore\UserInterface\IUserInterface.h" />
@@ -238,6 +249,12 @@
238249
<ClInclude Include="XCCore\XCRender\XCImageHelper.h" />
239250
<ClInclude Include="XCFrame.h" />
240251
</ItemGroup>
252+
<ItemGroup>
253+
<ResourceCompile Include="PythonSTG.rc" />
254+
</ItemGroup>
255+
<ItemGroup>
256+
<Image Include="..\pystg.ico" />
257+
</ItemGroup>
241258
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
242259
<ImportGroup Label="ExtensionTargets">
243260
</ImportGroup>

‎PythonSTG/PythonSTG.vcxproj.filters‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<Filter Include="XCCore\Menu">
5050
<UniqueIdentifier>{0b1f0165-e716-497e-a0ae-d9e4b7595711}</UniqueIdentifier>
5151
</Filter>
52+
<Filter Include="XCCore\Boss">
53+
<UniqueIdentifier>{80d87d3d-c728-4f4e-b0bc-1e8ba341ac8b}</UniqueIdentifier>
54+
</Filter>
55+
<Filter Include="Resouce">
56+
<UniqueIdentifier>{37898c7c-a6c7-4c12-a0a6-82cefb500e41}</UniqueIdentifier>
57+
</Filter>
5258
</ItemGroup>
5359
<ItemGroup>
5460
<ClCompile Include="util\ConfigManager.cpp">
@@ -170,9 +176,6 @@
170176
<ClCompile Include="XCCore\XCRender\ParticleHelper.cpp">
171177
<Filter>XCCore\XCRender</Filter>
172178
</ClCompile>
173-
<ClCompile Include="XCCore\Task\TaskBoss.cpp">
174-
<Filter>XCCore\Task</Filter>
175-
</ClCompile>
176179
<ClCompile Include="XCCore\Menu\GameMenu.cpp">
177180
<Filter>XCCore\Menu</Filter>
178181
</ClCompile>
@@ -184,6 +187,21 @@
184187
<Filter>XCCore\Bullet</Filter>
185188
</ClCompile>
186189
<ClCompile Include="pythonstg.cpp" />
190+
<ClCompile Include="XCCore\Boss\BossHelper.cpp">
191+
<Filter>XCCore\Boss</Filter>
192+
</ClCompile>
193+
<ClCompile Include="XCCore\Boss\Boss.cpp">
194+
<Filter>XCCore\Boss</Filter>
195+
</ClCompile>
196+
<ClCompile Include="XCCore\Boss\SpellCard.cpp">
197+
<Filter>XCCore\Boss</Filter>
198+
</ClCompile>
199+
<ClCompile Include="XCCore\Boss\BossObject.cpp">
200+
<Filter>XCCore\Boss</Filter>
201+
</ClCompile>
202+
<ClCompile Include="XCCore\UserInterface\BossInfoInterface.cpp">
203+
<Filter>XCCore\UserInterface</Filter>
204+
</ClCompile>
187205
</ItemGroup>
188206
<ItemGroup>
189207
<ClInclude Include="util\ConfigManager.h">
@@ -326,9 +344,6 @@
326344
<ClInclude Include="XCCore\XCRender\ParticleHelper.h">
327345
<Filter>XCCore\XCRender</Filter>
328346
</ClInclude>
329-
<ClInclude Include="XCCore\Task\TaskBoss.h">
330-
<Filter>XCCore\Task</Filter>
331-
</ClInclude>
332347
<ClInclude Include="XCCore\Menu\IMenu.h">
333348
<Filter>XCCore\Menu</Filter>
334349
</ClInclude>
@@ -342,5 +357,36 @@
342357
<ClInclude Include="XCCore\Bullet\OvalTypeBullet.h">
343358
<Filter>XCCore\Bullet</Filter>
344359
</ClInclude>
360+
<ClInclude Include="XCCore\Boss\BossHelper.h">
361+
<Filter>XCCore\Boss</Filter>
362+
</ClInclude>
363+
<ClInclude Include="XCCore\Boss\Boss.h">
364+
<Filter>XCCore\Boss</Filter>
365+
</ClInclude>
366+
<ClInclude Include="XCCore\Boss\SpellCard.h">
367+
<Filter>XCCore\Boss</Filter>
368+
</ClInclude>
369+
<ClInclude Include="XCCore\Boss\BossObject.h">
370+
<Filter>XCCore\Boss</Filter>
371+
</ClInclude>
372+
<ClInclude Include="XCCore\UserInterface\BossInfoInterface.h">
373+
<Filter>XCCore\UserInterface</Filter>
374+
</ClInclude>
375+
<ClInclude Include="resource1.h">
376+
<Filter>Resouce</Filter>
377+
</ClInclude>
378+
<ClInclude Include="resource.h">
379+
<Filter>Resouce</Filter>
380+
</ClInclude>
381+
</ItemGroup>
382+
<ItemGroup>
383+
<Image Include="..\pystg.ico">
384+
<Filter>Resouce</Filter>
385+
</Image>
386+
</ItemGroup>
387+
<ItemGroup>
388+
<ResourceCompile Include="PythonSTG.rc">
389+
<Filter>Resouce</Filter>
390+
</ResourceCompile>
345391
</ItemGroup>
346392
</Project>

‎PythonSTG/PythonSTG.vcxproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup />
44
</Project>

‎PythonSTG/PythonSTGConfig.exe‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)