浏览代码

修复导出收集动画bug,更新资源选择界面,更新部分导出逻辑错误

Menglan_Luo 2 年之前
父节点
当前提交
2c65130423
共有 4 个文件被更改,包括 24 次插入14 次删除
  1. 3 1
      datacpp/elemPropertyData.cpp
  2. 5 4
      resfiledialog.cpp
  3. 3 6
      resfiledialog.ui
  4. 13 3
      statusConfig.cpp

+ 3 - 1
datacpp/elemPropertyData.cpp

@@ -455,7 +455,9 @@ QJsonObject ElemPropertyData::exportAnim() const
         if(statusConfig[i].needCollect){
         if(statusConfig[i].needCollect){
             QJsonObject collObj;
             QJsonObject collObj;
             collObj["goalType"] = statusConfig[i].collTargetType.toInt();
             collObj["goalType"] = statusConfig[i].collTargetType.toInt();
-            collObj["collConf"] = statusConfig[i].collAnim;
+            if(statusConfig[i].collAnim != "尚未选择"){
+                collObj["collConf"] = statusConfig[i].collAnim;
+            }
             statusObj["collect"] = collObj;
             statusObj["collect"] = collObj;
         }
         }
         //事件
         //事件

+ 5 - 4
resfiledialog.cpp

@@ -13,7 +13,8 @@ ResFileDialog::ResFileDialog(QWidget *parent) :
     ui->buttonBox->button(QDialogButtonBox::Cancel)->setText("取消");
     ui->buttonBox->button(QDialogButtonBox::Cancel)->setText("取消");
     ui->buttonBox->button(QDialogButtonBox::Ok)->setText("确定");
     ui->buttonBox->button(QDialogButtonBox::Ok)->setText("确定");
     this->setAcceptDrops(true);
     this->setAcceptDrops(true);
-    ui->label_newFile->setAcceptDrops(false);
+    ui->textEdit->setAcceptDrops(false);
+    ui->textEdit->setReadOnly(true);
 }
 }
 
 
 ResFileDialog::~ResFileDialog()
 ResFileDialog::~ResFileDialog()
@@ -37,13 +38,13 @@ void ResFileDialog::dropEvent(QDropEvent *event)
         QList<QUrl> urls = mimeData->urls();
         QList<QUrl> urls = mimeData->urls();
         QString urlName = urls.at(0).toLocalFile();
         QString urlName = urls.at(0).toLocalFile();
         QString fileName = urlName;
         QString fileName = urlName;
-        ui->label_newFile->setText(fileName);
+        ui->textEdit->setText(fileName);
     }
     }
 }
 }
 
 
 void ResFileDialog::on_buttonBox_accepted()
 void ResFileDialog::on_buttonBox_accepted()
 {
 {
-    res = ui->label_newFile->text();
+    res = ui->textEdit->toPlainText();
 }
 }
 
 
 QString ResFileDialog::getResName()
 QString ResFileDialog::getResName()
@@ -52,6 +53,6 @@ QString ResFileDialog::getResName()
 }
 }
 void ResFileDialog::setResName(QString resName)
 void ResFileDialog::setResName(QString resName)
 {
 {
-    ui->label_newFile->setText(resName);
+    ui->textEdit->setText(resName);
 }
 }
 
 

+ 3 - 6
resfiledialog.ui

@@ -42,18 +42,15 @@
     <string>拖拽添加资源文件:</string>
     <string>拖拽添加资源文件:</string>
    </property>
    </property>
   </widget>
   </widget>
-  <widget class="QLabel" name="label_newFile">
+  <widget class="QTextEdit" name="textEdit">
    <property name="geometry">
    <property name="geometry">
     <rect>
     <rect>
      <x>40</x>
      <x>40</x>
-     <y>100</y>
+     <y>80</y>
      <width>321</width>
      <width>321</width>
-     <height>101</height>
+     <height>151</height>
     </rect>
     </rect>
    </property>
    </property>
-   <property name="text">
-    <string/>
-   </property>
   </widget>
   </widget>
  </widget>
  </widget>
  <resources/>
  <resources/>

+ 13 - 3
statusConfig.cpp

@@ -185,17 +185,27 @@ void StatusConfig::updateDropBox(bool state)
 void StatusConfig::setAnimIndex(ElemPropertyData::StatusConfig statusData)
 void StatusConfig::setAnimIndex(ElemPropertyData::StatusConfig statusData)
 {
 {
     int comboIndex;
     int comboIndex;
+    int row = ui->listWidget_status->currentRow();
     //初始化动画
     //初始化动画
     comboIndex = ui->comboBox_initAnim->findText(statusData.initAnim);
     comboIndex = ui->comboBox_initAnim->findText(statusData.initAnim);
-    if(comboIndex == -1) comboIndex = 0;
+    if(comboIndex == -1){
+        comboIndex = 0;
+        DataManager::getInstance()->changeStatusFundVal(currentElem,DataManager::StatusDataType::InitAnim,"尚未选择",row);
+    }
     ui->comboBox_initAnim->setCurrentIndex(comboIndex);
     ui->comboBox_initAnim->setCurrentIndex(comboIndex);
     //点击动画
     //点击动画
     comboIndex = ui->comboBox_clickAnim->findText(statusData.clickAnim);
     comboIndex = ui->comboBox_clickAnim->findText(statusData.clickAnim);
-    if(comboIndex == -1) comboIndex = 0;
+    if(comboIndex == -1){
+        DataManager::getInstance()->changeStatusFundVal(currentElem,DataManager::StatusDataType::ClickAnim,"尚未选择",row);
+        comboIndex = 0;
+    }
     ui->comboBox_clickAnim->setCurrentIndex(comboIndex);
     ui->comboBox_clickAnim->setCurrentIndex(comboIndex);
     //收集动画
     //收集动画
     comboIndex = ui->comboBox_collectAnimation->findText(statusData.collAnim);
     comboIndex = ui->comboBox_collectAnimation->findText(statusData.collAnim);
-    if(comboIndex == -1) comboIndex = 0;
+    if(comboIndex == -1){
+        comboIndex = 0;
+        DataManager::getInstance()->changeStatusFundVal(currentElem,DataManager::StatusDataType::CollAnim,"尚未选择",row);
+    }
     ui->comboBox_collectAnimation->setCurrentIndex(comboIndex);
     ui->comboBox_collectAnimation->setCurrentIndex(comboIndex);
 }
 }