Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14779 from xiaofeng11/v3.10 

Bug fix & update
This commit is contained in:
pandamicro 2015-12-23 12:35:52 +08:00
parent d11b2b4bfd 3fd8f36a90
commit 45d1d655cc
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/2d/CCMenuItem.cpp
View File

@ -104,6 +104,14 @@ void MenuItem::activate()
{ {
_callback(this); _callback(this);
} }
#if CC_ENABLE_SCRIPT_BINDING
if (kScriptTypeLua == _scriptType)
{
BasicScriptData data(this);
ScriptEvent scriptEvent(kMenuClickedEvent, &data);
ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(&scriptEvent);
}
#endif
} }
} }

8
tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp
View File

@ -22,9 +22,7 @@ enum
TouchesTests::TouchesTests() TouchesTests::TouchesTests()
{ {
ADD_TEST_CASE(PongScene); ADD_TEST_CASE(PongScene);
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 // Use 9.0 or higher SDK to compile
ADD_TEST_CASE(ForceTouchTest); ADD_TEST_CASE(ForceTouchTest);
#endif
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
// //
@ -115,8 +113,6 @@ void PongLayer::doStep(float delta)
resetAndScoreBallForPlayer( kHighPlayer ); resetAndScoreBallForPlayer( kHighPlayer );
} }
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 // Use 9.0 or higher SDK to compile
const char * _Info_Formatter = "Current force value : %0.02f, maximum possible force : %0.02f"; const char * _Info_Formatter = "Current force value : %0.02f, maximum possible force : %0.02f";
char formatBuffer[256] = {0, }; char formatBuffer[256] = {0, };
@ -146,7 +142,7 @@ std::string ForceTouchTest::title() const
std::string ForceTouchTest::subtitle() const std::string ForceTouchTest::subtitle() const
{ {
return std::string("Touch with force to see info label changes"); return std::string("Touch with force to see info label changes\nOnly work on iPhone6s / iPhone6s Plus");
} }
void ForceTouchTest::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) void ForceTouchTest::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
@ -169,5 +165,3 @@ void ForceTouchTest::onTouchesEnded(const std::vector<cocos2d::Touch*>& touches,
sprintf(formatBuffer, _Info_Formatter, 0.0f, 0.0f); sprintf(formatBuffer, _Info_Formatter, 0.0f, 0.0f);
_infoLabel->setString(std::string(formatBuffer)); _infoLabel->setString(std::string(formatBuffer));
} }
#endif

2
tests/cpp-tests/Classes/TouchesTest/TouchesTest.h
View File

@ -31,7 +31,6 @@ public:
void doStep(float delta); void doStep(float delta);
}; };
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 // Use 9.0 or higher SDK to compile
class ForceTouchTest : public TestCase class ForceTouchTest : public TestCase
{ {
public: public:
@ -50,6 +49,5 @@ protected:
cocos2d::Label * _infoLabel; cocos2d::Label * _infoLabel;
}; };
#endif
#endif #endif