2dx版本升级到2.2.4

Classes/AppDelegate.cpp

@@ -1,35 +1,27 @@
-#include "cocos2d.h"
-#include "CCEGLView.h"
 #include "AppDelegate.h"
-#include "CCLuaEngine.h"
 #include "SimpleAudioEngine.h"
-#include "Lua_extensions_CCB.h"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-#include "Lua_web_socket.h"
-#endif
-
 #include "OzgFileUtility.h"
 #include "RPGStartSceneLayer.h"
 
-using namespace CocosDenshion;
-
 USING_NS_CC;
 
-AppDelegate::AppDelegate()
+using namespace CocosDenshion;
+
+AppDelegate::AppDelegate() {
+
+}
+
+AppDelegate::~AppDelegate() 
 {
 }
 
-AppDelegate::~AppDelegate()
-{
-    SimpleAudioEngine::end();
-}
-
-bool AppDelegate::applicationDidFinishLaunching()
-{
+bool AppDelegate::applicationDidFinishLaunching() {
     // initialize director
-    CCDirector *pDirector = CCDirector::sharedDirector();
-    pDirector->setOpenGLView(CCEGLView::sharedOpenGLView());
+    CCDirector* pDirector = CCDirector::sharedDirector();
+    CCEGLView* pEGLView = CCEGLView::sharedOpenGLView();
 
+    pDirector->setOpenGLView(pEGLView);
+	
     CCEGLView::sharedOpenGLView()->setDesignResolutionSize(960, 640, kResolutionShowAll);
     
     // turn on display FPS
@@ -38,31 +30,11 @@ bool AppDelegate::applicationDidFinishLaunching()
     // set FPS. the default value is 1.0/60 if you don't call this
     pDirector->setAnimationInterval(1.0 / 60);
 
-    // register lua engine
-//    CCLuaEngine* pEngine = CCLuaEngine::defaultEngine();
-//    CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
-//
-//    CCLuaStack *pStack = pEngine->getLuaStack();
-//    lua_State *tolua_s = pStack->getLuaState();
-//    tolua_extensions_ccb_open(tolua_s);
-//#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-//    pStack = pEngine->getLuaStack();
-//    tolua_s = pStack->getLuaState();
-//    tolua_web_socket_open(tolua_s);
-//#endif
-//    
-//#if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
-//    CCFileUtils::sharedFileUtils()->addSearchPath("script");
-//#endif
-//
-//    std::string path = CCFileUtils::sharedFileUtils()->fullPathForFilename("hello.lua");
-//    pEngine->executeScriptFile(path.c_str());
-    
     //将数据库复制到可写目录
     string dbSrc = CCFileUtils::sharedFileUtils()->fullPathForFilename(GAME_SYS_DB);
     string dbDes = CCFileUtils::sharedFileUtils()->getWritablePath();
     dbDes.append(GAME_SYS_DB);
-        
+    
     if(!OzgFileUtility::fileExists(dbDes))
         OzgFileUtility::copyFile(dbSrc.c_str(), dbDes.c_str());
     CCLog("%s", dbDes.c_str());
@@ -72,7 +44,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     db.open(dbDes.c_str());
     
     CppSQLite3Query query = db.execQuery("select count(id) from save_data");
-//    CCLog("%i", query.getIntField(0));
+    //    CCLog("%i", query.getIntField(0));
     if(query.getIntField(0) == 0)
         db.execDML(GAME_INIT_SQL);
     
@@ -83,24 +55,27 @@ bool AppDelegate::applicationDidFinishLaunching()
     SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(CCUserDefault::sharedUserDefault()->getFloatForKey(GAME_BG_AUDIO_VOLUME, 1.0));
     SimpleAudioEngine::sharedEngine()->setEffectsVolume(CCUserDefault::sharedUserDefault()->getFloatForKey(GAME_EFFECT_AUDIO_VOLUME, 1.0));
     
-    CCScene *mainScene = RPGStartSceneLayer::scene();
-    pDirector->runWithScene(mainScene);
-    
+    // create a scene. it's an autorelease object
+    CCScene *pScene = RPGStartSceneLayer::scene();
+
+    // run
+    pDirector->runWithScene(pScene);
+
     return true;
 }
 
 // This function will be called when the app is inactive. When comes a phone call,it's be invoked too
-void AppDelegate::applicationDidEnterBackground()
-{
+void AppDelegate::applicationDidEnterBackground() {
     CCDirector::sharedDirector()->stopAnimation();
 
-    SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic();
+    // if you use SimpleAudioEngine, it must be pause
+    // SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic();
 }
 
 // this function will be called when the app is active again
-void AppDelegate::applicationWillEnterForeground()
-{
+void AppDelegate::applicationWillEnterForeground() {
     CCDirector::sharedDirector()->startAnimation();
 
-    SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic();
+    // if you use SimpleAudioEngine, it must resume here
+    // SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic();
 }

Classes/AppDelegate.h

@@ -1,5 +1,5 @@
-#ifndef __APP_DELEGATE_H__
-#define __APP_DELEGATE_H__
+#ifndef  _APP_DELEGATE_H_
+#define  _APP_DELEGATE_H_
 
 #include "cocos2d.h"
 
@@ -34,5 +34,5 @@ public:
     virtual void applicationWillEnterForeground();
 };
 
-#endif  // __APP_DELEGATE_H__
+#endif // _APP_DELEGATE_H_
 

Classes/RPGMapRoleSprite.cpp

@@ -31,7 +31,7 @@ bool RPGMapRoleSprite::init(CCString *roleTexture, CCString* name, bool isPlayer
     
     if(CCSprite::initWithSpriteFrame((CCSpriteFrame*)this->m_roleSpriteFrames->objectAtIndex(defaultSpriteFrameIndex)))
     {
-        CCLabelTTF *nameLab = CCLabelTTF::create(this->m_name->getCString(), "Arial", 15, CCSizeMake(this->getContentSize().width * 2.0, 20), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter);
+        CCLabelTTF *nameLab = CCLabelTTF::create(this->m_name->getCString(), "Arial", 15, CCSizeMake(this->getContentSize().width * 3.0, 20), kCCTextAlignmentCenter, kCCVerticalTextAlignmentCenter);
         nameLab->setPosition(ccp(15, 45));
         
         if(this->m_isPlayer)