From 63686244746925d43248ceaf8d9e31f50df68a72 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 01 九月 2025 17:21:43 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/CEquipmentPage2.cpp |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 14b46ac..984fa26 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -180,7 +180,17 @@
 
 			SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
 			if (pGlass != nullptr) {
-				m_listCtrl.SetItemText(index, 3, pGlass->getID().c_str());
+				CString strText;
+				if (pGlass->getType() == SERVO::MaterialsType::G1) {
+					strText.Format(_T("(G1)%s"), pGlass->getID().c_str());
+				}
+				else if (pGlass->getType() == SERVO::MaterialsType::G2) {
+					strText.Format(_T("(G2)%s"), pGlass->getID().c_str());
+				}
+				else {
+					strText.Format(_T("(%s"), pGlass->getID().c_str());
+				}
+				m_listCtrl.SetItemText(index, 3, strText);
 				SERVO::CGlass* pBuddy = pGlass->getBuddy();
 				if (pBuddy != nullptr) {
 					m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());

--
Gitblit v1.9.3