diff --git a/cocos2dx/include/ccConfig.h b/cocos2dx/include/ccConfig.h index af8b942fc7..b558a50003 100644 --- a/cocos2dx/include/ccConfig.h +++ b/cocos2dx/include/ccConfig.h @@ -107,7 +107,7 @@ To enabled set it to 1. Disabled by default. Default value: 0.1f */ #ifndef CC_DIRECTOR_STATS_INTERVAL -#define CC_DIRECTOR_STATS_INTERVAL (0.1f) +#define CC_DIRECTOR_STATS_INTERVAL (0.5f) #endif /** @def CC_DIRECTOR_FPS_POSITION diff --git a/samples/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj.REMOVED.git-id index 43163e6312..ba52908f2e 100644 --- a/samples/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -84cd25be53945443ed529554d1a4035b6989d150 \ No newline at end of file +4377122f5035f20d5266fff054f52039c3eb59f4 \ No newline at end of file diff --git a/samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj b/samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj index a1d0a81bc8..f2b22bf807 100644 --- a/samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj +++ b/samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj @@ -603,6 +603,10 @@ 15628F5B15F0F5C2000CF24B /* Resources */ = { isa = PBXGroup; children = ( + 159004D1166DE34B006BF838 /* Icon-144.png */, + 159004CF166DE346006BF838 /* Icon-72.png */, + 159004CD166DE33E006BF838 /* Icon-114.png */, + 159004CB166DE338006BF838 /* Icon-57.png */, 159003FF166DAD84006BF838 /* res */, 1A995C5E166B3F52001C34E9 /* boot-jsb.js */, 1A995C5F166B3F52001C34E9 /* main.js */, @@ -779,10 +783,6 @@ A92275321517C094001B78AA = { isa = PBXGroup; children = ( - 159004D1166DE34B006BF838 /* Icon-144.png */, - 159004CF166DE346006BF838 /* Icon-72.png */, - 159004CD166DE33E006BF838 /* Icon-114.png */, - 159004CB166DE338006BF838 /* Icon-57.png */, 15426AE915B5733200712A7F /* cocos2dx.xcodeproj */, 15384E3C16119CC30021DC07 /* bindings */, 2628297C15EC7196002C4240 /* chipmunk */,