diff --git a/Tool-1/Source_New/Chinese/EditorAnimationPage-zh_cn.cpp b/Tool-1/Source_New/Chinese/EditorAnimationPage-zh_cn.cpp index 1cf2aa9..c9cdf69 100644 --- 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 index 1dea1f9..d3d5c0a 100644 --- 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 index ea162a0..66d0104 100644 --- 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; isetCurrentProgress( 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; isetCurrentProgress( 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