!604 防止错误配置报错

pull/604/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent 7657cef3e7
commit 6b2317fde1

@ -132,7 +132,10 @@ export class BoardStore extends Singleton implements IConfigStore
}
UpdateOption(cof: IConfigOption)
{
Object.assign(this.m_Option, cof.option);
if (!cof.option)
cof.option = this.m_Option;
else
Object.assign(this.m_Option, cof.option);
if (this.m_UiOption)
Object.assign(this.m_UiOption, DataAdapter.ConvertUIData(cof.option));
Object.assign(this.m_BoardProcessOption, cof.processData);
@ -302,7 +305,10 @@ export class LayerBoardStore extends BoardStore
UpdateOption(cof: IConfigOption)
{
super.UpdateOption(cof);
Object.assign(this.layerNailOption, cof.nailData);
if (!cof.nailData)
cof.nailData = this.layerNailOption;
else
Object.assign(this.layerNailOption, cof.nailData);
if (this.uiLayerNailOption)
Object.assign(this.uiLayerNailOption, DataAdapter.ConvertUIData(this.layerNailOption));

Loading…
Cancel
Save