tryfix merge

Author: James Chen

cocos/2d/CCActionManager.h

@@ -61,13 +61,13 @@ class CC_DLL ActionManager : public Ref
     /**
      * @js ctor
      */
-    ActionManager();
+    ActionManager(void);
 
     /**
      * @js NA
      * @lua NA
      */
-    virtual ~ActionManager();
+    ~ActionManager(void);
 
     // actions
 
@@ -80,55 +80,55 @@ class CC_DLL ActionManager : public Ref
      * @param target    The target which need to be added an action.
      * @param paused    Is the target paused or not.
      */
-    virtual void addAction(Action *action, Node *target, bool paused);
+    void addAction(Action *action, Node *target, bool paused);
 
     /** Removes all actions from all the targets.
      */
-    virtual void removeAllActions();
+    void removeAllActions();
 
     /** Removes all actions from a certain target.
      All the actions that belongs to the target will be removed.
      *
      * @param target    A certain target.
      */
-    virtual void removeAllActionsFromTarget(Node *target);
+    void removeAllActionsFromTarget(Node *target);
 
     /** Removes an action given an action reference.
      *
      * @param action    A certain target.
      */
-    virtual void removeAction(Action *action);
+    void removeAction(Action *action);
 
     /** Removes an action given its tag and the target.
      *
      * @param tag       The action's tag.
      * @param target    A certain target.
      */
-    virtual void removeActionByTag(int tag, Node *target);
+    void removeActionByTag(int tag, Node *target);
 
     /** Removes all actions given its tag and the target.
      *
      * @param tag       The actions' tag.
      * @param target    A certain target.
      * @js NA
      */
-    virtual void removeAllActionsByTag(int tag, Node *target);
+    void removeAllActionsByTag(int tag, Node *target);
 
     /** Removes all actions matching at least one bit in flags and the target.
      *
      * @param flags     The flag field to match the actions' flags based on bitwise AND.
      * @param target    A certain target.
      * @js NA
      */
-    virtual void removeActionsByFlags(unsigned int flags, Node *target);
+    void removeActionsByFlags(unsigned int flags, Node *target);
 
     /** Gets an action given its tag an a target.
      *
      * @param tag       The action's tag.
      * @param target    A certain target.
      * @return  The Action the with the given tag.
      */
-    virtual Action* getActionByTag(int tag, const Node *target) const;
+    Action* getActionByTag(int tag, const Node *target) const;
 
     /** Returns the numbers of actions that are running in a certain target. 
      * Composable actions are counted as 1 action. Example:
@@ -170,37 +170,37 @@ class CC_DLL ActionManager : public Ref
      * @see getNumberOfRunningActionsInTarget
      * @js NA
      */
-    virtual size_t getNumberOfRunningActionsInTargetByTag(const Node *target, int tag);
+    size_t getNumberOfRunningActionsInTargetByTag(const Node *target, int tag);
 
 
     /** Pauses the target: all running actions and newly added actions will be paused.
      *
      * @param target    A certain target.
      */
-    virtual void pauseTarget(Node *target);
+    void pauseTarget(Node *target);
 
     /** Resumes the target. All queued actions will be resumed.
      *
      * @param target    A certain target.
      */
-    virtual void resumeTarget(Node *target);
+    void resumeTarget(Node *target);
 
     /** Pauses all running actions, returning a list of targets whose actions were paused.
      *
      * @return  A list of targets whose actions were paused.
      */
-    virtual Vector<Node*> pauseAllRunningActions();
+    Vector<Node*> pauseAllRunningActions();
 
     /** Resume a set of targets (convenience function to reverse a pauseAllRunningActions call).
      *
      * @param targetsToResume   A set of targets need to be resumed.
      */
-    virtual void resumeTargets(const Vector<Node*>& targetsToResume);
+    void resumeTargets(const Vector<Node*>& targetsToResume);
 
     /** Main loop of ActionManager.
      * @param dt    In seconds.
      */
-    virtual void update(float dt);
+    void update(float dt);
 
 protected:
     // declared in ActionManager.m

cocos/platform/android/java/libs/EngineDataManager.jar

@@ -111,9 +111,9 @@ bool _isFpsChanged = false;
 float _oldRealFps = 60.0f;
 
 uint32_t _lowFpsCheckMode = 0; // 0: Continuous mode, 1: Average mode
-float _lowRealFpsThreshold = 0.5f; // Unit: percentage (0 ~ 1)
+float _lowRealFpsThreshold = 0.25f; // Unit: percentage (0 ~ 1)
 std::chrono::steady_clock::time_point _lastTimeNotifyLevelByLowFps; // Only used in continuous mode 
-float _notifyLevelByLowFpsThreshold = 0.5f; // Unit: seconds, only used in continuous mode 
+float _notifyLevelByLowFpsThreshold = 0.2f; // Unit: seconds, only used in continuous mode 
 uint32_t _continuousLowRealFpsCount = 0; // Only used in continuous mode 
 uint32_t _continuousLowRealFpsThreshold = 1; // Only used in continuous mode
 uint32_t _calculateAvgFpsCount = 0; // Only used in average mode
@@ -1223,38 +1223,38 @@ void EngineDataManager::nativeOnChangeLowFpsConfig(JNIEnv* env, jobject thiz, ji
 
 void EngineDataManager::nativeOnChangeExpectedFps(JNIEnv* env, jobject thiz, jint fps)
 {
-    if (!_isSupported)
-        return;
-
-    if (fps < -1 || fps > 60)
-    {
-        LOGE("Setting fps (%d) isn't supported!", fps);
-        return;
-    }
-
-    auto director = cocos2d::Director::getInstance();
-    float defaultAnimationInterval = director->getAnimationInterval();
-
-    int defaultFps = static_cast<int>(std::ceil(1.0f/defaultAnimationInterval));
-
-    if (fps > defaultFps)
-    {
-        LOGD("nativeOnChangeExpectedFps, fps (%d) is greater than default fps (%d), reset it to default!", fps, defaultFps);
-        fps = -1;
-    }
-
-    LOGD("nativeOnChangeExpectedFps, set fps: %d, default fps: %d", fps, defaultFps);
-
-    if (fps > 0)
-    {
-        setAnimationIntervalBySystem(1.0f/fps);
-        LOGD("nativeOnChangeExpectedFps, fps (%d) was set successfuly!", fps);
-    }
-    else if (fps == -1) // -1 means to reset to default FPS
-    {
-        setAnimationIntervalBySystem(-1.0f);
-        LOGD("nativeOnChangeExpectedFps, fps (%d) was reset successfuly!", defaultFps);
-    }
+    // if (!_isSupported)
+    //     return;
+
+    // if (fps < -1 || fps > 60)
+    // {
+    //     LOGE("Setting fps (%d) isn't supported!", fps);
+    //     return;
+    // }
+
+    // auto director = cocos2d::Director::getInstance();
+    // float defaultAnimationInterval = director->getAnimationInterval();
+
+    // int defaultFps = static_cast<int>(std::ceil(1.0f/defaultAnimationInterval));
+
+    // if (fps > defaultFps)
+    // {
+    //     LOGD("nativeOnChangeExpectedFps, fps (%d) is greater than default fps (%d), reset it to default!", fps, defaultFps);
+    //     fps = -1;
+    // }
+
+    // LOGD("nativeOnChangeExpectedFps, set fps: %d, default fps: %d", fps, defaultFps);
+
+    // if (fps > 0)
+    // {
+    //     setAnimationIntervalBySystem(1.0f/fps);
+    //     LOGD("nativeOnChangeExpectedFps, fps (%d) was set successfuly!", fps);
+    // }
+    // else if (fps == -1) // -1 means to reset to default FPS
+    // {
+    //     setAnimationIntervalBySystem(-1.0f);
+    //     LOGD("nativeOnChangeExpectedFps, fps (%d) was reset successfuly!", defaultFps);
+    // }
 }
 
 void EngineDataManager::nativeOnChangeSpecialEffectLevel(JNIEnv* env, jobject thiz, jint level)