diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 3e20385..8bf7f83 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 f1f6f23..116a1a2 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 2acb1e1..1e008a3 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/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index d7a7f90..84b30b0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -3804,6 +3804,16 @@ private: System::Windows::Forms::TextBox^ tboxWarningPrivateSaveDataPurpose; this->changePurposeForms(this->rPurposeOther); } } + // 中韓リージョンでは"データ配信ROM"/"店頭試遊台(単独型)"をなくす + if( this->hSrl->IsRegionChina || this->hSrl->IsRegionKorea ) + { + this->rPurposeCardDistribution->Enabled = false; + this->rPurposeCardKiosk->Enabled = false; + if( this->rPurposeCardDistribution->Checked || this->rPurposeCardKiosk->Checked ) + { + this->changePurposeForms(this->rPurposeOther); + } + } // リージョンがコンボボックスで変更されている場合があるのでそちらを優先する @@ -3833,6 +3843,29 @@ private: System::Windows::Forms::TextBox^ tboxWarningPrivateSaveDataPurpose; this->rPurposeCardTouchTryDS->Enabled = true; } } + // 中韓リージョンでは"データ配信ROM"/"店頭試遊台(単独型)"をなくす + if( this->combRegion->DropDownStyle == System::Windows::Forms::ComboBoxStyle::DropDown ) + { + this->rPurposeCardDistribution->Enabled = false; + this->rPurposeCardKiosk->Enabled = false; + if( this->rPurposeCardDistribution->Checked || this->rPurposeCardKiosk->Checked ) + { + this->changePurposeForms(this->rPurposeOther); + } + } + else + { + if( this->hSrl->IsAlreadyReadOnce && this->hSrl->IsMediaNand ) + { + this->rPurposeCardDistribution->Enabled = false; + this->rPurposeCardKiosk->Enabled = false; + } + else + { + this->rPurposeCardDistribution->Enabled = true; + this->rPurposeCardKiosk->Enabled = true; + } + } } //maskPurposeForms() private: diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp index db25d2d..fd0a185 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_file.cpp @@ -148,6 +148,24 @@ System::Boolean Form1::loadSrl( System::String ^srlfile ) this->setGridError(); this->setGridWarn(); + // 提出情報の用途を更新する + cli::array ^rbuts = gcnew cli::array + { + this->rPurposeCardProduction, + this->rPurposeCardTouchTryDS, + this->rPurposeCardDistribution, + this->rPurposeCardKiosk, + this->rPurposeDSiWare, + this->rPurposeOther + }; + this->tboxPurposeInError->Text = ""; + for each( System::Windows::Forms::RadioButton ^r in rbuts ) + { + if( r->Checked ) + { + this->tboxPurposeInError->Text = System::String::Copy( r->Text ); + } + } return true; } // loadSrl() diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 6da233e..688d4e4 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index aaa325a..628bff3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -57,6 +57,12 @@ } "Entry" { + "MsmKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6EC739CA561443E48045379A268C1657" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -87,18 +93,6 @@ } "Entry" { - "MsmKey" = "8:_994B8A669FDD4C09B34BAA437FBC6F20" - "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_9B3015EC04CB4194B1A846A0D36A4C4B" - "OwnerKey" = "8:_994B8A669FDD4C09B34BAA437FBC6F20" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A3417E9C9F294832AE49B5BDAF95E373" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -117,6 +111,12 @@ } "Entry" { + "MsmKey" = "8:_E67AE567BCA041ABA7D402B9029EA503" + "OwnerKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -408,7 +408,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.24674, Culture=en, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=en, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -494,7 +494,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.24674, Culture=ja, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=ja, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -657,7 +657,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MasterEditorTWL" "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}" - "PackageCode" = "8:{8CA53434-43F3-4078-A2ED-81E77A5B8E1E}" + "PackageCode" = "8:{E2B78A12-4165-4BC1-99EC-3E8BF69CB7A6}" "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1186,7 +1186,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_994B8A669FDD4C09B34BAA437FBC6F20" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACA4D814AA04AF2A2F63060CDA5FA7D" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1200,7 +1200,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9B3015EC04CB4194B1A846A0D36A4C4B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E67AE567BCA041ABA7D402B9029EA503" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE"