From 7c4f79e2eb5d5b515b8e6b735554d6a3ab7f07a1 Mon Sep 17 00:00:00 2001 From: ozg Date: Thu, 26 Jun 2014 21:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3win32=E4=B9=B1=E7=A0=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/RPGBattleMenu.cpp | 2 +- Classes/RPGDialogLayer.cpp | 6 ++--- Classes/RPGLoadingSceneLayer.cpp | 2 +- Classes/RPGMapMenuLayer.cpp | 2 +- Classes/RPGStartSceneLayer.cpp | 38 ++++++++++++++++---------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Classes/RPGBattleMenu.cpp b/Classes/RPGBattleMenu.cpp index c4f91d4..361898d 100644 --- a/Classes/RPGBattleMenu.cpp +++ b/Classes/RPGBattleMenu.cpp @@ -168,7 +168,7 @@ void RPGBattleMenu::createMenuItem(float x, float y, CCString *text, RPGBattleMe CCMenuItemLabel *menuItems = (CCMenuItemLabel*)this->getChildByTag(tag); if(!menuItems) { - CCLabelTTF *menuItemsLabel = CCLabelTTF::create(OzgCCUtility::generalString(text->getCString()).c_str(), "Arial", 28, CCSizeMake(120, 30), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuItemsLabel = CCLabelTTF::create(text->getCString(), "Arial", 28, CCSizeMake(120, 30), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *menuItems = CCMenuItemLabel::create(menuItemsLabel, this, menu_selector(RPGBattleMenu::onMenu)); menuItems->setPosition(ccp(x, y)); diff --git a/Classes/RPGDialogLayer.cpp b/Classes/RPGDialogLayer.cpp index f5a7a57..3bf5e14 100644 --- a/Classes/RPGDialogLayer.cpp +++ b/Classes/RPGDialogLayer.cpp @@ -29,7 +29,7 @@ bool RPGDialogLayer::init(string titleStr, string menuOKStr, int menuItemOKTag, CCTMXTiledMap *mainBg = (CCTMXTiledMap*)this->getChildByTag(kRPGDialogLayerBg); CCMenu *menu = (CCMenu*)mainBg->getChildByTag(kRPGDialogLayerBgMenu); - CCLabelTTF *menuOKLab = CCLabelTTF::create(OzgCCUtility::generalString(CCString::create(menuOKStr)->getCString()).c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuOKLab = CCLabelTTF::create(menuOKStr.c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); menuOKLab->setColor(ccc3(160, 160, 160)); CCMenuItemLabel *menuOK = CCMenuItemLabel::create(menuOKLab, target, seletor); menuOK->setTag(menuItemOKTag); @@ -50,14 +50,14 @@ bool RPGDialogLayer::init(string titleStr, string menuOKStr, int menuItemOKTag, CCTMXTiledMap *mainBg = (CCTMXTiledMap*)this->getChildByTag(kRPGDialogLayerBg); CCMenu *menu = (CCMenu*)mainBg->getChildByTag(kRPGDialogLayerBgMenu); - CCLabelTTF *menuOKLab = CCLabelTTF::create(OzgCCUtility::generalString(CCString::create(menuOKStr)->getCString()).c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuOKLab = CCLabelTTF::create(menuOKStr.c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); menuOKLab->setColor(ccc3(160, 160, 160)); CCMenuItemLabel *menuOK = CCMenuItemLabel::create(menuOKLab, target, seletor); menuOK->setTag(menuItemOKTag); menuOK->setPosition(ccp(100, 60)); menu->addChild(menuOK); - CCLabelTTF *menuCancelLab = CCLabelTTF::create(OzgCCUtility::generalString(CCString::create(menuCancelStr)->getCString()).c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuCancelLab = CCLabelTTF::create(menuCancelStr.c_str(), "Arial", 20, CCSizeMake(120, 25), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); menuCancelLab->setColor(ccc3(160, 160, 160)); CCMenuItemLabel *menuCancel = CCMenuItemLabel::create(menuCancelLab, target, seletor); menuCancel->setTag(menuItemCancelTag); diff --git a/Classes/RPGLoadingSceneLayer.cpp b/Classes/RPGLoadingSceneLayer.cpp index 4945b2d..5dafd96 100755 --- a/Classes/RPGLoadingSceneLayer.cpp +++ b/Classes/RPGLoadingSceneLayer.cpp @@ -36,7 +36,7 @@ bool RPGLoadingSceneLayer::init(CCArray* loadTextures, CCArray* releaseTextures, this->m_stringList = CCDictionary::createWithContentsOfFileThreadSafe(languageFile.c_str()); CCString *loadingStr = (CCString*)this->m_stringList->objectForKey("loading"); - CCLabelTTF *loadingLabel = CCLabelTTF::create(OzgCCUtility::generalString(loadingStr->getCString()).c_str(), "FZCuYuan-M03S", 20, CCSizeMake(CCDirector::sharedDirector()->getWinSize().width, 30), kCCTextAlignmentCenter); + CCLabelTTF *loadingLabel = CCLabelTTF::create(loadingStr->getCString(), "FZCuYuan-M03S", 20, CCSizeMake(CCDirector::sharedDirector()->getWinSize().width, 30), kCCTextAlignmentCenter); loadingLabel->setColor(ccc3(255, 255, 255)); loadingLabel->setPosition(ccp(CCDirector::sharedDirector()->getWinSize().width / 2, 100)); diff --git a/Classes/RPGMapMenuLayer.cpp b/Classes/RPGMapMenuLayer.cpp index 3bfad75..7e735f7 100755 --- a/Classes/RPGMapMenuLayer.cpp +++ b/Classes/RPGMapMenuLayer.cpp @@ -216,7 +216,7 @@ void RPGMapMenuLayer::createMenuItem(float x, float y, CCString *text, RPGMapMen CCMenuItemLabel *menuItems = (CCMenuItemLabel*)mainMenu->getChildByTag(tag); if(!menuItems) { - CCLabelTTF *menuItemsLabel = CCLabelTTF::create(OzgCCUtility::generalString(text->getCString()).c_str(), "FZCuYuan-M03S", 25, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuItemsLabel = CCLabelTTF::create(text->getCString(), "FZCuYuan-M03S", 25, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); menuItems = CCMenuItemLabel::create(menuItemsLabel, this, menu_selector(RPGMapMenuLayer::onMenu)); menuItems->setPosition(ccp(x, y)); diff --git a/Classes/RPGStartSceneLayer.cpp b/Classes/RPGStartSceneLayer.cpp index d2a1e31..e21752b 100755 --- a/Classes/RPGStartSceneLayer.cpp +++ b/Classes/RPGStartSceneLayer.cpp @@ -143,12 +143,12 @@ void RPGStartSceneLayer::onMenu(cocos2d::CCObject *pObject) //还原背景音乐 CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_BG_AUDIO_VOLUME, 1.0); - ((CCMenuItemLabel*)settingsMenu->getChildByTag(kRPGStartSceneLayerTagSettingsBgAudioBtn))->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str()); + ((CCMenuItemLabel*)settingsMenu->getChildByTag(kRPGStartSceneLayerTagSettingsBgAudioBtn))->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()); SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(1); //还原效果声音 CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_EFFECT_AUDIO_VOLUME, 1.0); - ((CCMenuItemLabel*)settingsMenu->getChildByTag(kRPGStartSceneLayerTagSettingsEffectAudioBtn))->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str()); + ((CCMenuItemLabel*)settingsMenu->getChildByTag(kRPGStartSceneLayerTagSettingsEffectAudioBtn))->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()); SimpleAudioEngine::sharedEngine()->setEffectsVolume(1); } @@ -205,14 +205,14 @@ void RPGStartSceneLayer::onMenu(cocos2d::CCObject *pObject) { CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_BG_AUDIO_VOLUME, 1.0); - ((CCMenuItemLabel*)menuItem)->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str()); + ((CCMenuItemLabel*)menuItem)->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()); SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(1); } else { CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_BG_AUDIO_VOLUME, 0); - ((CCMenuItemLabel*)menuItem)->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()).c_str()); + ((CCMenuItemLabel*)menuItem)->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()); SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(0); } @@ -227,14 +227,14 @@ void RPGStartSceneLayer::onMenu(cocos2d::CCObject *pObject) { CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_EFFECT_AUDIO_VOLUME, 1.0); - ((CCMenuItemLabel*)menuItem)->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str()); + ((CCMenuItemLabel*)menuItem)->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()); SimpleAudioEngine::sharedEngine()->setEffectsVolume(1); } else { CCUserDefault::sharedUserDefault()->setFloatForKey(GAME_EFFECT_AUDIO_VOLUME, 0); - ((CCMenuItemLabel*)menuItem)->setString(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()).c_str()); + ((CCMenuItemLabel*)menuItem)->setString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()); SimpleAudioEngine::sharedEngine()->setEffectsVolume(0); } } @@ -294,13 +294,13 @@ void RPGStartSceneLayer::showMainMenu() this->addChild(mainMenu); CCString *menuStartStr = (CCString*)this->m_stringList->objectForKey("mainmenu_start"); - CCLabelTTF *menuStartLabel = CCLabelTTF::create(OzgCCUtility::generalString(menuStartStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuStartLabel = CCLabelTTF::create(menuStartStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCString *menuRestartStr = (CCString*)this->m_stringList->objectForKey("mainmenu_restart"); - CCLabelTTF *menuRestartLabel = CCLabelTTF::create(OzgCCUtility::generalString(menuRestartStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuRestartLabel = CCLabelTTF::create(menuRestartStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCString *menuSettingsStr = (CCString*)this->m_stringList->objectForKey("mainmenu_settings"); - CCLabelTTF *menuSettingsLabel = CCLabelTTF::create(OzgCCUtility::generalString(menuSettingsStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuSettingsLabel = CCLabelTTF::create(menuSettingsStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *menuStart = CCMenuItemLabel::create(menuStartLabel, this, menu_selector(RPGStartSceneLayer::onMenu)); menuStart->setPosition(ccp(CCDirector::sharedDirector()->getWinSize().width / 2, 230)); @@ -330,7 +330,7 @@ void RPGStartSceneLayer::showSettingsMenu() //设置样式的标题 CCString *labStyleStr = (CCString*)this->m_stringList->objectForKey("settingslab_style"); - CCLabelTTF *labStyleLabel = CCLabelTTF::create(OzgCCUtility::generalString(labStyleStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); + CCLabelTTF *labStyleLabel = CCLabelTTF::create(labStyleStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); labStyleLabel->setFontFillColor(ccc3(188, 188, 188)); labStyleLabel->setTag(kRPGStartSceneLayerTagLabStyle); labStyleLabel->setPosition(ccp(300, 550)); @@ -363,7 +363,7 @@ void RPGStartSceneLayer::showSettingsMenu() } if(labCurrStyleStr) { - CCLabelTTF *labCurrStyleLabel = CCLabelTTF::create(OzgCCUtility::generalString(labCurrStyleStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + CCLabelTTF *labCurrStyleLabel = CCLabelTTF::create(labCurrStyleStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); labCurrStyleLabel->setFontFillColor(ccc3(188, 188, 188)); labCurrStyleLabel->setTag(kRPGStartSceneLayerTagLabCurrStyle); labCurrStyleLabel->setPosition(ccp(550, 550)); @@ -372,7 +372,7 @@ void RPGStartSceneLayer::showSettingsMenu() //背景音乐的开关 CCString *labBgAudioStr = (CCString*)this->m_stringList->objectForKey("settingsmenu_bgaudio"); - CCLabelTTF *labBgAudioLabel = CCLabelTTF::create(OzgCCUtility::generalString(labBgAudioStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); + CCLabelTTF *labBgAudioLabel = CCLabelTTF::create(labBgAudioStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); labBgAudioLabel->setFontFillColor(ccc3(188, 188, 188)); labBgAudioLabel->setTag(kRPGStartSceneLayerTagLabBgAudio); labBgAudioLabel->setPosition(ccp(300, 470)); @@ -381,9 +381,9 @@ void RPGStartSceneLayer::showSettingsMenu() //背景音乐的开关的按钮 CCLabelTTF *labBgAudioBtnLabel = NULL; if(CCUserDefault::sharedUserDefault()->getFloatForKey(GAME_BG_AUDIO_VOLUME, 1.0) == 0) - labBgAudioBtnLabel = CCLabelTTF::create(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + labBgAudioBtnLabel = CCLabelTTF::create(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); else - labBgAudioBtnLabel = CCLabelTTF::create(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + labBgAudioBtnLabel = CCLabelTTF::create(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *labBgAudioBtn = CCMenuItemLabel::create(labBgAudioBtnLabel, this, menu_selector(RPGStartSceneLayer::onMenu)); labBgAudioBtn->setPosition(ccp(550, 470)); labBgAudioBtn->setTag(kRPGStartSceneLayerTagSettingsBgAudioBtn); @@ -391,7 +391,7 @@ void RPGStartSceneLayer::showSettingsMenu() //效果声音的开关 CCString *labEffectAudioStr = (CCString*)this->m_stringList->objectForKey("settingsmenu_effectaudio"); - CCLabelTTF *labEffectAudioLabel = CCLabelTTF::create(OzgCCUtility::generalString(labEffectAudioStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); + CCLabelTTF *labEffectAudioLabel = CCLabelTTF::create(labEffectAudioStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); labEffectAudioLabel->setFontFillColor(ccc3(188, 188, 188)); labEffectAudioLabel->setTag(kRPGStartSceneLayerTagLabEffectAudio); labEffectAudioLabel->setPosition(ccp(300, 390)); @@ -400,9 +400,9 @@ void RPGStartSceneLayer::showSettingsMenu() //效果声音的开关的按钮 CCLabelTTF *labEffectAudioBtnLabel = NULL; if(CCUserDefault::sharedUserDefault()->getFloatForKey(GAME_EFFECT_AUDIO_VOLUME, 1.0) == 0) - labEffectAudioBtnLabel = CCLabelTTF::create(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + labEffectAudioBtnLabel = CCLabelTTF::create(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_on"))->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); else - labEffectAudioBtnLabel = CCLabelTTF::create(OzgCCUtility::generalString(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); + labEffectAudioBtnLabel = CCLabelTTF::create(((CCString*)this->m_stringList->objectForKey("settingsmenu_audio_off"))->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *labEffectAudioBtn = CCMenuItemLabel::create(labEffectAudioBtnLabel, this, menu_selector(RPGStartSceneLayer::onMenu)); labEffectAudioBtn->setPosition(ccp(550, 390)); labEffectAudioBtn->setTag(kRPGStartSceneLayerTagSettingsEffectAudioBtn); @@ -410,7 +410,7 @@ void RPGStartSceneLayer::showSettingsMenu() //恢复默认 CCString *menuRestoreStr = (CCString*)this->m_stringList->objectForKey("settingsmenu_restore"); - CCLabelTTF *menuRestoreLabel = CCLabelTTF::create(OzgCCUtility::generalString(menuRestoreStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuRestoreLabel = CCLabelTTF::create(menuRestoreStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *menuRestore = CCMenuItemLabel::create(menuRestoreLabel, this, menu_selector(RPGStartSceneLayer::onMenu)); menuRestore->setPosition(ccp(300, 170)); menuRestore->setTag(kRPGStartSceneLayerTagSettingsRestore); @@ -418,7 +418,7 @@ void RPGStartSceneLayer::showSettingsMenu() //返回 CCString *menuBackStr = (CCString*)this->m_stringList->objectForKey("settingsmenu_back"); - CCLabelTTF *menuBackLabel = CCLabelTTF::create(OzgCCUtility::generalString(menuBackStr->getCString()).c_str(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); + CCLabelTTF *menuBackLabel = CCLabelTTF::create(menuBackStr->getCString(), "FZCuYuan-M03S", 28, CCSizeMake(120, 40), kCCTextAlignmentLeft, kCCVerticalTextAlignmentCenter); CCMenuItemLabel *menuBack = CCMenuItemLabel::create(menuBackLabel, this, menu_selector(RPGStartSceneLayer::onMenu)); menuBack->setPosition(ccp(300, 100)); menuBack->setTag(kRPGStartSceneLayerTagSettingsBack);