|
@@ -11,7 +11,7 @@ StatusEffectAnim::StatusEffectAnim(QWidget *parent) :
|
|
|
{
|
|
|
ui->setupUi(this);
|
|
|
this->setAcceptDrops(true);
|
|
|
- ui->tableWidget_animation->setHorizontalHeaderLabels({"名称","资源","时间线","z-Order"});
|
|
|
+ ui->tableWidget_animation->setHorizontalHeaderLabels({"名称","资源","时间线","z-Order","音效"});
|
|
|
}
|
|
|
|
|
|
StatusEffectAnim::~StatusEffectAnim()
|
|
@@ -73,6 +73,7 @@ void StatusEffectAnim::setUi(QString elem)
|
|
|
QComboBox* timeline = createTimelineBox(i.timeline,i.res);
|
|
|
ui->tableWidget_animation->setCellWidget(rowNum,2,timeline);
|
|
|
ui->tableWidget_animation->setItem(rowNum,3,new QTableWidgetItem(i.zOrder));
|
|
|
+ ui->tableWidget_animation->setItem(rowNum,4,new QTableWidgetItem(i.audio));
|
|
|
}
|
|
|
}
|
|
|
void StatusEffectAnim::on_pushButton_addAnimation_clicked()
|
|
@@ -94,6 +95,7 @@ void StatusEffectAnim::on_pushButton_addAnimation_clicked()
|
|
|
ui->tableWidget_animation->setItem(rowNum,1,res);
|
|
|
ui->tableWidget_animation->setCellWidget(rowNum,2,createBox("尚未选择",{}));
|
|
|
ui->tableWidget_animation->setItem(rowNum,3,new QTableWidgetItem("0"));
|
|
|
+ ui->tableWidget_animation->setItem(rowNum,4,new QTableWidgetItem(""));
|
|
|
DataManager::getInstance()->addAnim(currentElem,animName);
|
|
|
}
|
|
|
|
|
@@ -138,6 +140,10 @@ void StatusEffectAnim::on_tableWidget_animation_itemChanged(QTableWidgetItem *it
|
|
|
}
|
|
|
std::cout<<"z-Order值发生改变,新值为:"<<zOrder<<std::endl;
|
|
|
DataManager::getInstance()->changeAnimTable(currentElem,nZOrder,row,3);
|
|
|
+ } if(column == 4){
|
|
|
+ QString audio = item->text();
|
|
|
+ std::cout<<"音效发生改变,新值为:"<<qPrintable(audio)<<std::endl;
|
|
|
+ DataManager::getInstance()->changeAnimTable(currentElem,audio,row,4);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -191,5 +197,6 @@ void StatusEffectAnim::on_pushButton_copyAnim_clicked()
|
|
|
QComboBox* timeline = createTimelineBox(animData.timeline,animData.res);
|
|
|
ui->tableWidget_animation->setCellWidget(rowNum,2,timeline);
|
|
|
ui->tableWidget_animation->setItem(rowNum,3,new QTableWidgetItem(animData.zOrder));
|
|
|
+ ui->tableWidget_animation->setItem(rowNum,4,new QTableWidgetItem(animData.audio));
|
|
|
}
|
|
|
|