三万里河东入海，五千仞岳上摩天

scarsty · scarsty · commit f0536f9b21b9 · 2024-07-10T20:57:31.000+08:00
优化ui的状态部分，菜单项的查找逻辑
diff --git a/src/BattleSceneSekiro.cpp b/src/BattleSceneSekiro.cpp
@@ -556,11 +556,13 @@ void BattleSceneSekiro::dealEvent(BP_Event& e)
             int index = -1;
             //0攻击，5防御，3闪身，其他不处理
             if (engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_RIGHTSHOULDER)
+                || engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_Y)
                 || engine->checkKeyPress(BPK_i))
             {
                 index = 0;
             }
             if (engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_LEFTSHOULDER)
+                || engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_X)
                 || engine->checkKeyPress(BPK_e))
             {
                 index = 5;
diff --git a/src/RunNode.cpp b/src/RunNode.cpp
@@ -139,8 +139,8 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)
     }
     auto current = getChild(i0);
 
-    int min1 = 9999, min2 = 9999 * 2;
-    int i1 = i0;
+    double min1 = 9999, min2 = 9999 * 10;
+    int i1 = i0, i2 = i0;
     //1表示平行于按键方向上的距离，2表示垂直于按键方向上的距离
     for (int i = 0; i < childs_.size(); i++)
     {
@@ -150,6 +150,7 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)
         }
         auto c = childs_[i];
         int dis1, dis2;
+        double deg;
         switch (direct)
         {
         case DirectLeft:
@@ -173,17 +174,23 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)
         }
         if (dis1 <= 0)
         {
-            dis1 += 10000;
+            continue;
+        }
+        deg = atan2(dis2, dis1) * 180 / 3.14159265;
+        //fmt1::print("{} {} {} \n", dis1, dis2, deg);
+        if (dis1 < min1 && deg < 15)
+        {
+            min1 = dis1;
+            i1 = i;
         }
-        if (dis1 + dis2 * 10 < min2)
+        if (dis1 + deg * 20 < min2)
         {
-            min1 = (std::min)(min1, dis1);
-            min2 = (std::min)(min2, dis1 + dis2 * 10);
+            min2 = dis1 + deg * 20;
             i1 = i;
         }
-        //以上数字的取法：如有坐标一致的点，不考虑第二距离（好像不太明显，以后再改吧）
     }
-    return i1;
+    if (i1 != i0) { return i1; }
+    return i2;
 }
 
 int RunNode::findFristVisibleChild()
diff --git a/src/TitleScene.cpp b/src/TitleScene.cpp
@@ -64,7 +64,8 @@ TitleScene::~TitleScene()
 void TitleScene::draw()
 {
     Engine::getInstance()->fillColor({ 0, 0, 0, 255 }, 0, 0, Engine::getInstance()->getWindowWidth(), Engine::getInstance()->getWindowHeight());
-    TextureManager::getInstance()->renderTexture("title", 154, 0, 90);
+    int pic[] = { 154, 154, 153, 154 };
+    TextureManager::getInstance()->renderTexture("title", pic[battle_mode_], 0, 90);
     Font::getInstance()->draw(GameUtil::VERSION(), 28, 0, 0);
     return;
     //屏蔽随机头像
diff --git a/src/UI.cpp b/src/UI.cpp
@@ -14,7 +14,6 @@ UI::UI()
     ui_system_->setPosition(300, 0);
     addChild(ui_status_);
 
-    //貌似这里不能直接调用其他单例，静态量的创建顺序不确定
     button_status_ = std::make_shared<Button>();
     button_status_->setTexture("title", 122);
     button_item_ = std::make_shared<Button>();
@@ -28,7 +27,9 @@ UI::UI()
     addChild(heads_);
     for (int i = 0; i < TEAMMATE_COUNT; i++)
     {
-        heads_->addChild(std::make_shared<Head>(), 20, 60 + i * 90);
+        auto h = std::make_shared<Head>();
+        heads_->addChild(h, 20, 60 + i * 90);
+        ui_status_->getMenu()->addChild(h);
     }
     heads_->getChild(0)->setState(NodePass);
     //addChild(heads_);
@@ -56,6 +57,7 @@ void UI::dealEvent(BP_Event& e)
         std::shared_ptr<Head> head = std::dynamic_pointer_cast<Head>(heads_->getChild(i));
         auto role = Save::getInstance()->getTeamMate(i);
         head->setRole(role);
+        head->setVisible(role != nullptr);
         if (role == nullptr)
         {
             continue;
@@ -88,7 +90,7 @@ void UI::dealEvent(BP_Event& e)
     //这里设定当前头像为Pass，令其不变暗，因为检测事件是先检测子节点，所以这里可以生效
     if (childs_[0] == ui_status_)
     {
-        heads_->getChild(current_head_)->setState(NodePass);
+        //heads_->getChild(current_head_)->setState(NodePass);
     }
     childs_[current_button_]->setState(NodePass);
 
@@ -154,10 +156,12 @@ void UI::dealEvent(BP_Event& e)
     {
         heads_->setDealEvent(1);
         heads_->setUDStyle(1);
+        heads_->setVisible(false);
     }
     else
     {
         heads_->setDealEvent(0);
+        heads_->setVisible(true);
     }
 }
 
diff --git a/src/UIStatus.h b/src/UIStatus.h
@@ -11,7 +11,7 @@ class UIStatus : public RunNode
 
 protected:
     std::shared_ptr<Button> button_medicine_, button_detoxification_, button_leave_;
-    std::shared_ptr<Menu> menu_;//, menu_equip_magic_, menu_equip_item_;
+    std::shared_ptr<Menu> menu_;    //, menu_equip_magic_, menu_equip_item_;
     std::vector<std::shared_ptr<Button>> equip_magics_;
     std::shared_ptr<Button> equip_item_;
 
@@ -22,11 +22,16 @@ class UIStatus : public RunNode
     virtual void draw() override;
     virtual void dealEvent(BP_Event& e) override;
     virtual void onPressedOK() override;
+
     void setShowButton(bool b) { show_button_ = b; }
 
     void setRole(Role* r) { role_ = r; }
+
     void setRoleName(std::string name);
+
     Role* getRole() { return role_; }
 
     void setExtentionVisible(bool b);
+
+    std::shared_ptr<Menu>& getMenu() { return menu_; }
 };

Original file line number	Diff line number	Diff line change
`@@ -556,11 +556,13 @@ void BattleSceneSekiro::dealEvent(BP_Event& e)`
`556`	`556`	`int index = -1;`
`557`	`557`	`//0攻击，5防御，3闪身，其他不处理`
`558`	`558`	`if (engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_RIGHTSHOULDER)`
	`559`	`+ \|\| engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_Y)`
`559`	`560`	`\|\| engine->checkKeyPress(BPK_i))`
`560`	`561`	`{`
`561`	`562`	`index = 0;`
`562`	`563`	`}`
`563`	`564`	`if (engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_LEFTSHOULDER)`
	`565`	`+ \|\| engine->gameControllerGetButton(BP_CONTROLLER_BUTTON_X)`
`564`	`566`	`\|\| engine->checkKeyPress(BPK_e))`
`565`	`567`	`{`
`566`	`568`	`index = 5;`
Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,8 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)`
`139`	`139`	`}`
`140`	`140`	`auto current = getChild(i0);`
`141`	`141`
`142`		`- int min1 = 9999, min2 = 9999 * 2;`
`143`		`- int i1 = i0;`
	`142`	`+ double min1 = 9999, min2 = 9999 * 10;`
	`143`	`+ int i1 = i0, i2 = i0;`
`144`	`144`	`//1表示平行于按键方向上的距离，2表示垂直于按键方向上的距离`
`145`	`145`	`for (int i = 0; i < childs_.size(); i++)`
`146`	`146`	`{`
`@@ -150,6 +150,7 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)`
`150`	`150`	`}`
`151`	`151`	`auto c = childs_[i];`
`152`	`152`	`int dis1, dis2;`
	`153`	`+ double deg;`
`153`	`154`	`switch (direct)`
`154`	`155`	`{`
`155`	`156`	`case DirectLeft:`
`@@ -173,17 +174,23 @@ int RunNode::findNextVisibleChild(int i0, Direct direct)`
`173`	`174`	`}`
`174`	`175`	`if (dis1 <= 0)`
`175`	`176`	`{`
`176`		`- dis1 += 10000;`
	`177`	`+ continue;`
	`178`	`+ }`
	`179`	`+ deg = atan2(dis2, dis1) * 180 / 3.14159265;`
	`180`	`+ //fmt1::print("{} {} {} \n", dis1, dis2, deg);`
	`181`	`+ if (dis1 < min1 && deg < 15)`
	`182`	`+ {`
	`183`	`+ min1 = dis1;`
	`184`	`+ i1 = i;`
`177`	`185`	`}`
`178`		`- if (dis1 + dis2 * 10 < min2)`
	`186`	`+ if (dis1 + deg * 20 < min2)`
`179`	`187`	`{`
`180`		`- min1 = (std::min)(min1, dis1);`
`181`		`- min2 = (std::min)(min2, dis1 + dis2 * 10);`
	`188`	`+ min2 = dis1 + deg * 20;`
`182`	`189`	`i1 = i;`
`183`	`190`	`}`
`184`		`- //以上数字的取法：如有坐标一致的点，不考虑第二距离（好像不太明显，以后再改吧）`
`185`	`191`	`}`
`186`		`- return i1;`
	`192`	`+ if (i1 != i0) { return i1; }`
	`193`	`+ return i2;`
`187`	`194`	`}`
`188`	`195`
`189`	`196`	`int RunNode::findFristVisibleChild()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ UI::UI()`
`14`	`14`	`ui_system_->setPosition(300, 0);`
`15`	`15`	`addChild(ui_status_);`
`16`	`16`
`17`		`- //貌似这里不能直接调用其他单例，静态量的创建顺序不确定`
`18`	`17`	`button_status_ = std::make_shared<Button>();`
`19`	`18`	`button_status_->setTexture("title", 122);`
`20`	`19`	`button_item_ = std::make_shared<Button>();`
`@@ -28,7 +27,9 @@ UI::UI()`
`28`	`27`	`addChild(heads_);`
`29`	`28`	`for (int i = 0; i < TEAMMATE_COUNT; i++)`
`30`	`29`	`{`
`31`		`- heads_->addChild(std::make_shared<Head>(), 20, 60 + i * 90);`
	`30`	`+ auto h = std::make_shared<Head>();`
	`31`	`+ heads_->addChild(h, 20, 60 + i * 90);`
	`32`	`+ ui_status_->getMenu()->addChild(h);`
`32`	`33`	`}`
`33`	`34`	`heads_->getChild(0)->setState(NodePass);`
`34`	`35`	`//addChild(heads_);`
`@@ -56,6 +57,7 @@ void UI::dealEvent(BP_Event& e)`
`56`	`57`	`std::shared_ptr<Head> head = std::dynamic_pointer_cast<Head>(heads_->getChild(i));`
`57`	`58`	`auto role = Save::getInstance()->getTeamMate(i);`
`58`	`59`	`head->setRole(role);`
	`60`	`+ head->setVisible(role != nullptr);`
`59`	`61`	`if (role == nullptr)`
`60`	`62`	`{`
`61`	`63`	`continue;`
`@@ -88,7 +90,7 @@ void UI::dealEvent(BP_Event& e)`
`88`	`90`	`//这里设定当前头像为Pass，令其不变暗，因为检测事件是先检测子节点，所以这里可以生效`
`89`	`91`	`if (childs_[0] == ui_status_)`
`90`	`92`	`{`
`91`		`- heads_->getChild(current_head_)->setState(NodePass);`
	`93`	`+ //heads_->getChild(current_head_)->setState(NodePass);`
`92`	`94`	`}`
`93`	`95`	`childs_[current_button_]->setState(NodePass);`
`94`	`96`
`@@ -154,10 +156,12 @@ void UI::dealEvent(BP_Event& e)`
`154`	`156`	`{`
`155`	`157`	`heads_->setDealEvent(1);`
`156`	`158`	`heads_->setUDStyle(1);`
	`159`	`+ heads_->setVisible(false);`
`157`	`160`	`}`
`158`	`161`	`else`
`159`	`162`	`{`
`160`	`163`	`heads_->setDealEvent(0);`
	`164`	`+ heads_->setVisible(true);`
`161`	`165`	`}`
`162`	`166`	`}`
`163`	`167`