diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index d37a0ef..5b6133e 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index aa79416..59da9b7 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 8002076..cde1589 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 5db9b2c..9f2cd0a 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -105,6 +105,7 @@ void Form1::setDeliverableProperties(void) this->rPurposeNandDSCentre, this->rPurposeNandShop, this->rPurposeZone, + this->rPurposeOther, }; for each( System::Windows::Forms::RadioButton ^r in rbuts ) { @@ -115,7 +116,11 @@ void Form1::setDeliverableProperties(void) } if( this->rPurposeOther->Checked ) { - this->hDeliv->hUsage = this->rPurposeOther->Text + "(" + this->tboxPurposeOther->Text + ")"; + this->hDeliv->hUsageDetail = this->tboxPurposeOther->Text; + } + else + { + this->hDeliv->hUsageDetail = ""; } // 会社情報 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 77e2dc4..fa9e883 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -242,6 +242,10 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( { node->FirstChild->Value = this->hUsage; } + if( node->FirstChild->Value->Equals( "TagUsageDetail" ) ) + { + node->FirstChild->Value = this->hUsageDetail; + } if( node->FirstChild->Value->Equals( "TagRomVersion" ) ) { node->FirstChild->Value = hSrl->RomVersion.ToString("X2"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h index 504588a..ca6c6da 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -42,19 +42,20 @@ namespace MasterEditorTWL // field public: // 提出情報 - property System::String ^hProductName; // 製品名 - property System::String ^hProductCode1; // 製品コード - property System::String ^hProductCode2; // 製品コード + property System::String ^hProductName; // 製品名 + property System::String ^hProductCode1; // 製品コード + property System::String ^hProductCode2; // 製品コード property System::Int32 ReleaseYear; // 発売予定日 property System::Int32 ReleaseMonth; property System::Int32 ReleaseDay; property System::Int32 SubmitYear; // 提出日 property System::Int32 SubmitMonth; property System::Int32 SubmitDay; - property System::String ^hSubmitWay; // 提出方法 - property System::String ^hUsage; // 用途 + property System::String ^hSubmitWay; // 提出方法 + property System::String ^hUsage; // 用途 + property System::String ^hUsageDetail; property System::Int32 SubmitVersion; // 提出バージョン - property System::String ^hSDK; // SDKバージョン + property System::String ^hSDK; // SDKバージョン property System::Boolean IsReleaseForeign; // 海外版の予定 property System::String ^hProductNameForeign; property System::String ^hProductCode1Foreign;