diff --git a/Classes/RPGMapEquipMenuLayer.cpp b/Classes/RPGMapEquipMenuLayer.cpp index 31a0594..3a755c3 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(((CCString*)this->m_stringList->objectForKey("menu_equip_unset"))->getCString(), "Arial", 26); + CCControlButton *btnRemoveArms = CCControlButton::create(((CCString*)this->m_stringList->objectForKey("menu_equip_remove"))->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(((CCString*)this->m_stringList->objectForKey("menu_equip_unset"))->getCString(), "Arial", 26); + CCControlButton *btnRemoveArmor = CCControlButton::create(((CCString*)this->m_stringList->objectForKey("menu_equip_remove"))->getCString(), "Arial", 26); btnRemoveArmor->setPosition(ccp(700, 320)); btnRemoveArmor->setTitleColorForState(ccc3(177, 177, 177), CCControlStateNormal); btnRemoveArmor->setTag(kRPGMapEquipMenuLayerTagBtnRemoveArmor); diff --git a/Resources/scene_map_cns.plist b/Resources/scene_map_cns.plist index 5a83a57..252f320 100755 --- a/Resources/scene_map_cns.plist +++ b/Resources/scene_map_cns.plist @@ -76,7 +76,7 @@ 武器:%s menu_equip_armor 防具:%s - menu_equip_unset + menu_equip_remove 卸掉 npc_dialog_buy 买入 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 836831d..91e52de 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/xcshareddata/OzgGameRPG.xccheckout b/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcshareddata/OzgGameRPG.xccheckout new file mode 100644 index 0000000..607992d --- /dev/null +++ b/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcshareddata/OzgGameRPG.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 9A46C5CA-9AE9-4FB5-9510-F9F7042B8370 + IDESourceControlProjectName + OzgGameRPG + IDESourceControlProjectOriginsDictionary + + 49362472-CDB7-4896-8E37-80DA1C167755 + https://github.com/ouzhigang/OzgGameRPG.git + + IDESourceControlProjectPath + proj.mac/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.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate b/proj.mac/OzgGameRPG.xcodeproj/project.xcworkspace/xcuserdata/ouzhigang.xcuserdatad/UserInterfaceState.xcuserstate index 56c50a3..0cc39a6 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