diff --git a/Classes/RPGMapEquipMenuLayer.cpp b/Classes/RPGMapEquipMenuLayer.cpp index 3f1d3c6..31a0594 100644 --- a/Classes/RPGMapEquipMenuLayer.cpp +++ b/Classes/RPGMapEquipMenuLayer.cpp @@ -306,7 +306,7 @@ void RPGMapEquipMenuLayer::setPlayerEquip(int dataId) { addLab(this, kRPGMapEquipMenuLayerTagEquipArms, CCString::createWithFormat(((CCString*)this->m_stringList->objectForKey("menu_equip_arms"))->getCString(), query.getStringField("arms_name")), 26, ccp(600, 405)); - CCControlButton *btnRemoveArms = CCControlButton::create("卸掉", "Arial", 26); + CCControlButton *btnRemoveArms = CCControlButton::create(((CCString*)this->m_stringList->objectForKey("menu_equip_unset"))->getCString(), "Arial", 26); btnRemoveArms->setPosition(ccp(700, 405)); btnRemoveArms->setTitleColorForState(ccc3(177, 177, 177), CCControlStateNormal); btnRemoveArms->setTag(kRPGMapEquipMenuLayerTagBtnRemoveArms); @@ -320,7 +320,7 @@ void RPGMapEquipMenuLayer::setPlayerEquip(int dataId) { addLab(this, kRPGMapEquipMenuLayerTagEquipArmor, CCString::createWithFormat(((CCString*)this->m_stringList->objectForKey("menu_equip_armor"))->getCString(), query.getStringField("armor_name")), 26, ccp(600, 320)); - CCControlButton *btnRemoveArmor = CCControlButton::create("卸掉", "Arial", 26); + CCControlButton *btnRemoveArmor = CCControlButton::create(((CCString*)this->m_stringList->objectForKey("menu_equip_unset"))->getCString(), "Arial", 26); btnRemoveArmor->setPosition(ccp(700, 320)); btnRemoveArmor->setTitleColorForState(ccc3(177, 177, 177), CCControlStateNormal); btnRemoveArmor->setTag(kRPGMapEquipMenuLayerTagBtnRemoveArmor); diff --git a/Classes/RPGStartSceneLayer.cpp b/Classes/RPGStartSceneLayer.cpp index e21752b..49b386f 100755 --- a/Classes/RPGStartSceneLayer.cpp +++ b/Classes/RPGStartSceneLayer.cpp @@ -41,9 +41,9 @@ bool RPGStartSceneLayer::init() this->m_stringList->retain(); //样式数据 - this->m_styleData.push_back(pair("style1", "样式1")); - this->m_styleData.push_back(pair("style2", "样式2")); - this->m_styleData.push_back(pair("style3", "样式3")); + this->m_styleData.push_back(pair("style1", ((CCString*)this->m_stringList->objectForKey("settingsmenu_style01"))->getCString())); + this->m_styleData.push_back(pair("style2", ((CCString*)this->m_stringList->objectForKey("settingsmenu_style02"))->getCString())); + this->m_styleData.push_back(pair("style3", ((CCString*)this->m_stringList->objectForKey("settingsmenu_style03"))->getCString())); //使用数据库的当前样式 RPGSaveData *saveDataObj = loadSaveData(&this->m_db); diff --git a/README.md b/README.md index 10c6522..9715395 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ ozg game — RPG Demo 声音文件来自 http://www.66rpg.com/type.php?t=17 -目前只部署了ios、mac平台。 +目前部署了ios、mac、win32平台。 +win32平台下需要将Classes文件夹里面的所有文件的编码转为GBK 游戏第一次启动的时候会把数据库复制到可写文件夹,若数据库结构因为一些改动发生了变化,需要把旧的数据库删除。 diff --git a/Resources/scene_map_cns.plist b/Resources/scene_map_cns.plist index a9426eb..5a83a57 100755 --- a/Resources/scene_map_cns.plist +++ b/Resources/scene_map_cns.plist @@ -76,6 +76,8 @@ 武器:%s menu_equip_armor 防具:%s + menu_equip_unset + 卸掉 npc_dialog_buy 买入 npc_dialog_buy_msg diff --git a/Resources/scene_start_cns.plist b/Resources/scene_start_cns.plist index b80d2f9..dd91985 100755 --- a/Resources/scene_start_cns.plist +++ b/Resources/scene_start_cns.plist @@ -28,5 +28,11 @@ settingsmenu_audio_off + settingsmenu_style01 + 样式1 + settingsmenu_style02 + 样式2 + settingsmenu_style03 + 样式3 diff --git a/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcshareddata/OzgGameRPG.xccheckout b/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcshareddata/OzgGameRPG.xccheckout new file mode 100644 index 0000000..64d8f5f --- /dev/null +++ b/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcshareddata/OzgGameRPG.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + BE783F00-5C7D-4F2B-BBA1-1933C415D2DE + IDESourceControlProjectName + OzgGameRPG + IDESourceControlProjectOriginsDictionary + + 49362472-CDB7-4896-8E37-80DA1C167755 + https://github.com/ouzhigang/OzgGameRPG.git + + IDESourceControlProjectPath + proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 49362472-CDB7-4896-8E37-80DA1C167755 + ../../.. + + IDESourceControlProjectURL + https://github.com/ouzhigang/OzgGameRPG.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 49362472-CDB7-4896-8E37-80DA1C167755 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 49362472-CDB7-4896-8E37-80DA1C167755 + IDESourceControlWCCName + OzgGameRPG + + + + diff --git a/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate b/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate index ba11a68..836831d 100644 Binary files a/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate and b/proj.ios/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate b/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate index aa471f5..56c50a3 100644 Binary files a/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate and b/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate differ