diff --git a/SchoolFestival2017/20170915-230213-575.png b/SchoolFestival2017/20170915-230213-575.png new file mode 100644 index 0000000..e1f4df2 Binary files /dev/null and b/SchoolFestival2017/20170915-230213-575.png differ diff --git a/SchoolFestival2017/GameScene.hpp b/SchoolFestival2017/GameScene.hpp index 51c17af..fed076d 100644 --- a/SchoolFestival2017/GameScene.hpp +++ b/SchoolFestival2017/GameScene.hpp @@ -17,7 +17,7 @@ inline double vec2ToRadian(const Vec2& v){ class GameScene:public MySceneManager::Scene{ private: const int hitsize =50; - const int seedslimit=5; + const size_t seedslimit=5; public: Drag drag; Unit unit; diff --git a/SchoolFestival2017/Global.hpp b/SchoolFestival2017/Global.hpp index 77ae078..023ce7c 100644 --- a/SchoolFestival2017/Global.hpp +++ b/SchoolFestival2017/Global.hpp @@ -22,11 +22,11 @@ class GlobalData{ using MySceneManager=SceneManager; namespace Name{ - - const String font =L"font"; - const String font_large =L"font_l"; - const String font_small =L"font_s"; - const String fontname =L"Rounded-X Mgen+ 1pp regular"; + const String + font =L"font", + font_large =L"font_l", + font_small =L"font_s", + fontname =L"Rounded-X Mgen+ 1pp regular"; namespace File{ const String highscore=L"highscore.fal"; const String font =L"resources/font/rounded-x-mgenplus-1pp-regular.ttf"; @@ -46,15 +46,16 @@ namespace Name{ }; } namespace Flower{ - const String blue =L"flower_blue" ; - const String brown =L"flower_brown" ; - const String green =L"flower_green" ; - const String orange =L"flower_orange"; - const String pink =L"flower_pink" ; - const String purple =L"flower_purple"; - const String red =L"flower_red" ; - const String sky =L"flower_skyblue"; - const String yellow =L"flower_yellow"; + const String + blue =L"flower_blue" , + brown =L"flower_brown" , + green =L"flower_green" , + orange =L"flower_orange", + pink =L"flower_pink" , + purple =L"flower_purple", + red =L"flower_red" , + sky =L"flower_skyblue", + yellow =L"flower_yellow"; const Array colors={ blue, brown, @@ -72,6 +73,9 @@ namespace Name{ namespace GColor{ const Color darkblack={0,0,0,150}; const Color lightblack={0,0,0,100}; + const Color darkbrown={165,42,42,150}; + const Color lightbrown={165,42,42,100}; + const Color brown=Palette::Brown; } inline bool _registerflower(const String& v){ diff --git a/SchoolFestival2017/Main.cpp b/SchoolFestival2017/Main.cpp index 72c62a0..e4a1d45 100644 --- a/SchoolFestival2017/Main.cpp +++ b/SchoolFestival2017/Main.cpp @@ -29,6 +29,8 @@ void Main(){ mng.setFadeColor({0,0,0,100}); mng.init(Scene::Title); + Window::SetTitle(L"Worker Bee ver 1.1"); + while (System::Update()){ TextureAsset(Name::BG).draw(); diff --git a/SchoolFestival2017/RankScene.hpp b/SchoolFestival2017/RankScene.hpp index 79c4bb9..908dae6 100644 --- a/SchoolFestival2017/RankScene.hpp +++ b/SchoolFestival2017/RankScene.hpp @@ -27,11 +27,11 @@ class RankScene:public MySceneManager::Scene{ FontAsset(Name::font)(L"読み込めませんでした……") .drawCenter(Window::Center()); }else{ - for(int i=0;iWin32Proj SchoolFestival2017 8.1 + WorkerBee @@ -165,6 +166,7 @@ + @@ -259,8 +261,8 @@ - + diff --git a/SchoolFestival2017/SchoolFestival2017.vcxproj.filters b/SchoolFestival2017/SchoolFestival2017.vcxproj.filters index 20b2b3d..eb06d31 100644 --- a/SchoolFestival2017/SchoolFestival2017.vcxproj.filters +++ b/SchoolFestival2017/SchoolFestival2017.vcxproj.filters @@ -156,6 +156,9 @@ 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ\resources + + 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ + @@ -365,8 +368,8 @@ 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ\resources - - 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ\resources + + 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ @@ -430,7 +433,9 @@ 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ\resources\font - + + 繝ｪ繧ｽ繝ｼ繧ｹ 繝輔ぃ繧､繝ｫ + diff --git a/SchoolFestival2017/TitleScene.hpp b/SchoolFestival2017/TitleScene.hpp index a18ce1e..2a9d943 100644 --- a/SchoolFestival2017/TitleScene.hpp +++ b/SchoolFestival2017/TitleScene.hpp @@ -1,10 +1,14 @@ #pragma once #include"Global.hpp" + +#include + class TitleScene:public MySceneManager::Scene{ public: const RoundRect - start{110,400,350,120,40}, - rank {500,400,350,120,40}; + start{260,400,270,70,40},//start{180,400,270,70,40}, + rule {510,400,270,70,40}, + rank {430,480,270,70,40};//rank {510,480,270,70,40}; void update() override{ if(start.leftClicked){ changeScene(Scene::Game); @@ -16,22 +20,30 @@ class TitleScene:public MySceneManager::Scene{ Input::GetCharsHelper(m_data->playername); } void draw() const override{ - FontAsset(Name::font_large)(L"ここに素晴らしいタイトル") - .drawCenter({Window::Center().x,200}); + FontAsset(Name::font_large)(L"ハタラキバチ") + .drawCenter({Window::Center().x,150}); + FontAsset(Name::font )(L"- Worker Bee -") + .draw({470,180}); + Rect(440,285,700,60) + .draw ({255,255,255,100}) + .drawFrame(1,1,GColor::darkblack); FontAsset(Name::font)(L"おなまえは？："+m_data->playername) .draw(150,280); + + FontAsset(Name::font_small)(L"(ランクインするとのこります)") .draw(150,350); - start - .draw(start.mouseOver?GColor::lightblack:GColor::darkblack); - rank - .draw(rank .mouseOver?GColor::lightblack:GColor::darkblack); + start.draw(start.mouseOver?GColor::lightbrown:GColor::darkbrown); + //rule.draw(rule .mouseOver?GColor::lightbrown:GColor::darkbrown); + rank.draw(rank .mouseOver?GColor::lightbrown:GColor::darkbrown); - FontAsset(Name::font_large)(L"はじめる") + FontAsset(Name::font)(L"はじめる") .drawCenter(start.center); - FontAsset(Name::font_large)(L"ランキング") + //FontAsset(Name::font)(L"あそびかた") + // .drawCenter(rule.center); + FontAsset(Name::font)(L"ランキング") .drawCenter(rank.center); } }; \ No newline at end of file