Tool-1 : Merge jasonrohrer/OneLife

- Update Tool-1\Source_New\* ———— - 更新 Tool-1\Source_New\*
is52hertz · Feb 11, 2024 · be60e4e · be60e4e
1 parent 1dfc5e3
commit be60e4e
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 10 deletions.
diff --git a/Tool-1/Source_New/Chinese/EditorAnimationPage-zh_cn.cpp b/Tool-1/Source_New/Chinese/EditorAnimationPage-zh_cn.cpp
@@ -724,6 +724,8 @@ static AnimationRecord *createRecordForObject( int inObjectID,
         zeroRecord( &( r->slotAnim[j] ) );
         }
 
+    r->authorTag = NULL;
+
     return r;
     }
 

diff --git a/Tool-1/Source_New/Chinese/EditorObjectPage-zh_cn.cpp b/Tool-1/Source_New/Chinese/EditorObjectPage-zh_cn.cpp
@@ -174,7 +174,7 @@ EditorObjectPage::EditorObjectPage()
           mNumUsesField( smallFont, 
                          258,  110, 2,
                          false,
-                         "# 耐久", "0123456789", NULL ),
+                         "#耐久", "0123456789", NULL ),
           mUseChanceField( smallFont, 
                            300,  110, 4,
                            false,

diff --git a/Tool-1/Source_New/Chinese/editor-zh_cn.cpp b/Tool-1/Source_New/Chinese/editor-zh_cn.cpp
@@ -1,4 +1,4 @@
-int versionNumber = 406;
+int versionNumber = 409;
 
 
 
@@ -1138,10 +1138,10 @@ void drawFrame( char inUpdate ) {
 
                         if( rebuilding ) {
                             loadingPage->setCurrentPhase( 
-                                "SPRITE - 图元##(重建缓存)" );
+                                "SPRITES - 图元##(重建缓存)" );
                             }
                         else {
-                            loadingPage->setCurrentPhase( "SPRITE - 图元" );
+                            loadingPage->setCurrentPhase( "SPRITES - 图元" );
                             }
                         loadingPage->setCurrentProgress( 0 );
 
@@ -1171,6 +1171,67 @@ void drawFrame( char inUpdate ) {
 
                         loadingPhaseStartTime = Time::getCurrentTime();
 
+                        int numBlocks = initImportAddStart();
+                        loadingPage->setCurrentPhase( "IMPORT ADD" );
+                        loadingPage->setCurrentProgress( 0 );
+
+
+                        loadingStepBatchSize = numBlocks / 20;
+
+                        if( loadingStepBatchSize < 1 ) {
+                            loadingStepBatchSize = 1;
+                            }
+
+                        loadingPhase ++;
+                        }
+                    break;
+                    }
+                case 3: {
+                    float progress;
+                    for( int i=0; i<loadingStepBatchSize; i++ ) {    
+                        progress = initImportAddStep();
+                        loadingPage->setCurrentProgress( progress );
+                        }
+
+                    if( progress == 1.0 ) {
+                        initImportAddFinish();                        
+
+                        printf( "Finished import add in %f sec\n",
+                                Time::getCurrentTime() - 
+                                loadingPhaseStartTime );
+
+                        loadingPhaseStartTime = Time::getCurrentTime();
+
+                        int numBlocks = initImportReplaceStart();
+                        loadingPage->setCurrentPhase( "IMPORT REPLACE" );
+                        loadingPage->setCurrentProgress( 0 );
+
+
+                        loadingStepBatchSize = numBlocks / 20;
+
+                        if( loadingStepBatchSize < 1 ) {
+                            loadingStepBatchSize = 1;
+                            }
+
+                        loadingPhase ++;
+                        }
+                    break;
+                    }
+                case 4: {
+                    float progress;
+                    for( int i=0; i<loadingStepBatchSize; i++ ) {    
+                        progress = initImportReplaceStep();
+                        loadingPage->setCurrentProgress( progress );
+                        }
+
+                    if( progress == 1.0 ) {
+                        initImportReplaceFinish();                        
+
+                        printf( "Finished import replace in %f sec\n",
+                                Time::getCurrentTime() - 
+                                loadingPhaseStartTime );
+
+                        loadingPhaseStartTime = Time::getCurrentTime();
 
                         char rebuilding;
 
@@ -1197,7 +1258,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 3: {
+                case 5: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initAnimationBankStep();
@@ -1239,7 +1300,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 4: {
+                case 6: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initObjectBankStep();
@@ -1269,7 +1330,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 5: {
+                case 7: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initModLoaderStep();
@@ -1313,7 +1374,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 6: {
+                case 8: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initCategoryBankStep();
@@ -1357,7 +1418,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 7: {
+                case 9: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initTransBankStep();
@@ -1380,7 +1441,7 @@ void drawFrame( char inUpdate ) {
                         }
                     break;
                     }
-                case 8: {
+                case 10: {
                     float progress;
                     for( int i=0; i<loadingStepBatchSize; i++ ) {    
                         progress = initGroundSpritesStep();
-Original file line number
+Diff line change
@@ Expand Up @@
             zeroRecord( &( r->slotAnim[j] ) );
             }
+        r->authorTag = NULL;
         return r;
         }
@@ Expand Down @@