diff --git a/Client/DragonNest/DragonNest.vcxproj.user b/Client/DragonNest/DragonNest.vcxproj.user index 8fd449b6..f625142a 100644 --- a/Client/DragonNest/DragonNest.vcxproj.user +++ b/Client/DragonNest/DragonNest.vcxproj.user @@ -4,7 +4,7 @@ WindowsLocalDebugger $(SolutionDir)..\..\build\client\DragonNest.exe $(SolutionDir)..\..\build\client\ - /ip:127.0.0.1 /port:14300 + /ip:127.0.0.1 /port:14300 /unuse_packing false diff --git a/Common/EtFileSystem/EtFileSystem.cpp b/Common/EtFileSystem/EtFileSystem.cpp index 90978d9e..b8d9fb34 100644 --- a/Common/EtFileSystem/EtFileSystem.cpp +++ b/Common/EtFileSystem/EtFileSystem.cpp @@ -269,7 +269,7 @@ DWORD CEtPackingFile::CalcChecksum( int nFileIndex ) int i, nSize; DWORD dwChecksum = 0, *pdwBuffer; - // nSize 4 ٲ۴.. + // nSize甫 4狼 硅荐肺 官槽促.. nSize = m_vecPackingFileInfo[ nFileIndex ].dwCompressSize / 4; if( m_vecPackingFileInfo[ nFileIndex ].dwCompressSize % 4 ) { @@ -370,7 +370,7 @@ bool CEtPackingFile::OpenFileSystem(const char* strPath, bool bReadOnly /* = fal m_bIsReadOnly = bReadOnly; if( bReadOnly ) { - m_hFile = CreateFile(strPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, // ߺ Read ϰ . + m_hFile = CreateFile(strPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, // 吝汗 Read 啊瓷窍霸 荐沥. FILE_ATTRIBUTE_NORMAL,NULL); } else @@ -387,7 +387,7 @@ bool CEtPackingFile::OpenFileSystem(const char* strPath, bool bReadOnly /* = fal return false; } - // ý εѴ. + // 颇老 矫胶袍 庆歹甫 肺靛茄促. _Read( m_hFile, &m_PackingFileHeader, sizeof( SPackingFileHeader ) ); if( ( m_PackingFileHeader.nVersion < PACKING_FILE_NOCHECKSUM_VERSION ) || ( m_PackingFileHeader.nVersion > PACKING_FILE_VERSION ) ) { @@ -395,10 +395,10 @@ bool CEtPackingFile::OpenFileSystem(const char* strPath, bool bReadOnly /* = fal return false; } - // Ͻýۿ ɼ ȵ ־ ϳ Seek ãƾ Ѵ. + // 备滚傈 颇老矫胶袍俊绰 颇老牢器 可悸捞 救甸绢 乐绢辑 颇老场俊辑 Seek栏肺 茫酒具 茄促. if( m_PackingFileHeader.nVersion > PACKING_FILE_NOCHECKSUM_VERSION ) { - // bRequireHeaderWrite ġ ȵư.. ߸ ý .. + // bRequireHeaderWrite 蔼捞 悸泼 蹬 乐栏搁 菩摹锭 力措肺 辆丰 救灯巴烙.. 肋给等 颇老 矫胶袍栏肺 牢沥.. if( m_PackingFileHeader.bRequireHeaderWrite == true ) { //rlkt_pak @@ -433,7 +433,7 @@ bool CEtPackingFile::OpenFileSystem(const char* strPath, bool bReadOnly /* = fal GeneratePackingMap(); - // 丮 ֻ 丮 ٲ۴. + // 泅犁 叼泛配府甫 弥惑困 叼泛配府肺 官槽促. ChangeDir("\\"); m_strPackingFileName = strPath; @@ -455,14 +455,14 @@ bool CEtPackingFile::NewFileSystem(const char* strPath) return false; } - // + // 庆歹 沥焊 父甸扁 memset( &m_PackingFileHeader, 0, sizeof( SPackingFileHeader ) ); strcpy_s( m_PackingFileHeader.szHeaderString, 256, PACKING_FILE_STRING ); m_PackingFileHeader.nVersion = PACKING_FILE_VERSION; m_PackingFileHeader.nFileCount = 0; m_PackingFileHeader.dwFileInfoOffset = PACKING_HEADER_RESERVED + sizeof( SPackingFileHeader ); - // + // 庆歹 扁废 if( _Write( m_hFile, &m_PackingFileHeader, sizeof( SPackingFileHeader ) ) == false ) { return false; @@ -627,24 +627,24 @@ CEtFileHandle *CEtPackingFile::OpenOnly( const char *strPath ) void CEtPackingFile::_Tokenize( const std::string& str, std::vector& tokens, const std::string& delimiters /* = " " */ ) { - // ù ڰ + // 盖 霉 臂磊啊 备盒磊牢 版快 公矫 std::string::size_type lastPos = str.find_first_not_of( delimiters, 0 ); - // ڰ ƴ ù ڸ ã´ + // 备盒磊啊 酒囱 霉 臂磊甫 茫绰促 std::string::size_type pos = str.find_first_of( delimiters, lastPos ); while( std::string::npos != pos || std::string::npos != lastPos ) { - // token ã vector ߰Ѵ + // token阑 茫疽栏聪 vector俊 眠啊茄促 tokens.push_back( str.substr( lastPos, pos - lastPos ) ); - // ڸ پѴ´. "not_of" ϶ + // 备盒磊甫 顿绢逞绰促. "not_of"俊 林狼窍扼 lastPos = str.find_first_not_of( delimiters, pos ); - // ڰ ƴ ڸ ã´ + // 促澜 备盒磊啊 酒囱 臂磊甫 茫绰促 pos = str.find_first_of( delimiters, lastPos ); } } -// str ڿ ߿ szOld szNew Ѵ. +// str 巩磊凯 吝俊辑 szOld 啊 乐栏搁 傈何 szNew 肺 函版茄促. void CEtPackingFile::_AllReplace( std::string& str, std::string& szOld, std::string& szNew ) { while (true) @@ -801,7 +801,7 @@ bool CEtPackingFile::AddFile(const char* strPath) { if( m_hFile == INVALID_HANDLE_VALUE) return false; - // ߰ ε + // 眠啊且 角力 颇老 肺靛 HANDLE hFile = INVALID_HANDLE_VALUE; hFile = CreateFile( strPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,NULL ); @@ -809,7 +809,7 @@ bool CEtPackingFile::AddFile(const char* strPath) if( hFile == INVALID_HANDLE_VALUE ) return false; - // ũ⸦ ˾Ƴ. + // 颇老 农扁甫 舅酒郴辑. DWORD dwFileSize = GetFileSize(hFile, NULL); if( dwFileSize == INVALID_FILE_SIZE ) { @@ -853,7 +853,7 @@ bool CEtPackingFile::AddFile(const char* strName, char *pData, DWORD nSize) if( g_bUseCompress ) { - // Ѵ. + // 拘绵茄促. if(compress2( ( BYTE * )pDstData, (uLongf*)&lDstSize, ( BYTE * )pData, nSize, Z_BEST_SPEED) != Z_OK) { delete[] pDstData; @@ -870,11 +870,11 @@ bool CEtPackingFile::AddFile(const char* strName, char *pData, DWORD nSize) CopyMemory(&nSeedKey, pDstData, sizeof(DWORD)); - // õ ε ϳ .. + // 利寸茄 矫靛 牢郸胶甫 窍唱 榜扼辑.. DWORD nSeedCnt = nSeedKey%ET_SEED_CNT; DWORD nSeed = ET_ENCRYPT_SEED[nSeedCnt]; - // .. XOR -_- + // 利寸洒.. XOR 肺 函版窍磊 -_- _Encode( ( BYTE * )pDstData, lDstSize, nSeed ); char szName[ _MAX_PATH ]; @@ -903,7 +903,7 @@ bool CEtPackingFile::AddFile(const char* strName, char *pData, DWORD nSize) _Seek( m_hFile, m_vecPackingFileInfo[ nFindEmptyIndex ].dwOffset, SEEK_SET ); _Write( m_hFile, pDstData,lDstSize ); - // µ ð ɷ ǥø صΰ CloseFileSystem() Ѳ WriteѴ + // 颇老 庆歹 静绰单 矫埃 腹捞 吧妨辑 钎矫父 秦滴绊 CloseFileSystem()俊辑 庆歹 茄波锅俊 Write茄促 m_PackingFileHeader.bRequireHeaderWrite = true; m_PackingFileHeader.dwFileInfoOffset = ( DWORD )_Seek( m_hFile, 0, SEEK_CUR ); } @@ -979,7 +979,7 @@ int CEtPackingFile::ReservePatchFile( SPackingFileInfo *pFileInfo ) PackingFileInfo.dwOffset = m_PackingFileHeader.dwFileInfoOffset; m_vecPackingFileInfo.push_back( PackingFileInfo ); - // ุ ɰ Write ġ + // 抗距父 吧绊 庆歹 Write绰 抗距捞 促 场抄 饶 菩摹 傈 角青 m_PackingFileHeader.bRequireHeaderWrite = true; m_PackingFileHeader.dwFileInfoOffset += PackingFileInfo.dwCompressSize; @@ -1057,7 +1057,7 @@ bool CEtPackingFile::PatchFile( CEtFileHandle *pFileHandle ) _Seek( m_hFile, m_vecPackingFileInfo[ nFindEmptyIndex ].dwOffset, SEEK_SET ); _Write( m_hFile, pFileHandle->m_pData, pFileHandle->m_FileInfo.dwCompressSize ); - // µ ð ɷ ǥø صΰ CloseFileSystem() Ѳ WriteѴ + // 颇老 庆歹 静绰单 矫埃 腹捞 吧妨辑 钎矫父 秦滴绊 CloseFileSystem()俊辑 庆歹 茄波锅俊 Write茄促 m_PackingFileHeader.bRequireHeaderWrite = true; m_PackingFileHeader.dwFileInfoOffset = ( DWORD )_Seek( m_hFile, 0, SEEK_CUR ); } @@ -1317,7 +1317,7 @@ bool CEtPackingFile::Patch( const char* strPatchPath, CPatchCallback* pCallpack, int j; for( j = 0; j < ( int )pvecSkipList->size(); j++ ) { - // ̸ տ.. \ پ ־ װ ̸ ؾ ȴ. + // 颇老捞抚 菊俊.. \ 嘿绢 乐绢辑 弊芭 力寇茄 捞抚栏肺 厚背秦具 力措肺 等促. if( _stricmp( pPackingFileInfo->szFileName + 1, ( *pvecSkipList )[ j ].c_str() ) == 0 ) { bSkip = true; @@ -1455,15 +1455,13 @@ bool CEtFileSystem::AddPackingFile(const char* szPackingFileName, const char *sz return false; } - //TODO(Cussrro):Դļ + //TODO(Cussrro):导出资源文件 //auto file_count = pPackingFile->GetFileCount(); - //for (int i = 0; i < file_count; i++) - //{ + //for (int i = 0; i < file_count; i++) { // auto info = pPackingFile->GetFileInfo(i); // auto handle = pPackingFile->OpenFile(info->szFileName); - // if (!info || !handle) - // { - // OutputDebugStringA("δҵ:"); + // if (!info || !handle) { + // OutputDebugStringA("未找到:"); // OutputDebugStringA(info->szFileName); // OutputDebugStringA("\n"); // pPackingFile->CloseFile(handle); @@ -1714,11 +1712,11 @@ void CEtFileSystem::FindFileListInFolder( const char *szFolderName, const char * } } - // ŷ ȿ ִ ߿ \resource\ext ϴ ƾε, - // ⶧, Ź 150ms ̰ . - // ̰ ŷϾȿ þ, ext ð ʿϹǷ, - // ̷ ijø ּ · ϰڴ. - // ̷ ϴ ѾȾ Ͱ εӵ ش.(TableDBε κ) + // 菩欧颇老 救俊 乐绰 颇老吝俊 \resource\ext肺 矫累窍绰 颇老阑 掘绢坷绰 风凭牢单, + // 葛电 颇老阑 促 第瘤扁锭巩俊, 概锅 150ms狼 掉饭捞啊 积变促. + // 捞霸 痢痢 菩欧颇老救俊 颇老捞 疵绢唱绊, ext狼 俺荐啊 腹酒龙荐废 歹 腹篮 荐青矫埃捞 鞘夸窍骨肺, + // 捞犯霸 某矫甫 抵辑 掘绢坷绰 屈怕肺 窍摆促. + // 捞犯霸 窍聪 蒲救静绰 巴苞 厚搅茄 肺爹加档甫 焊咯霖促.(TableDB肺靛 何盒) m_szMapCacheFileListInFolder.insert( make_pair( strFolder, ResultArray ) ); } diff --git a/Common/EtInterface/EtUIDialog.h b/Common/EtInterface/EtUIDialog.h index 6acb9b8a..0152d2d7 100644 --- a/Common/EtInterface/EtUIDialog.h +++ b/Common/EtInterface/EtUIDialog.h @@ -493,7 +493,7 @@ T* CEtUIDialog::GetControl( const char *pszControlName, bool *pExistControl ) //assert( 0 && "UI Control 을 찾을 수 없습니다! 자세한 정보는 EtUIDialog.h의 374라인으로"); char szFileName[256]; _GetFullFileName(szFileName, _countof(szFileName), m_strDialogFileName.c_str()); - OutputDebug(" [UI Error] \"%s\" 파일의 %s Control 을 찾을 수 없습니다!\n", szFileName, pszControlName); + CDebugSet::ToLogFile(" [UI Error] %s \"%s\" 未找到!\n", szFileName, pszControlName); //#endif // 파일에 출력할때는 한번 출력한거 건너뛰게 하기 위해, string 맵에 넣어두고 없을때만 출력.