diff --git a/Tests/cocos2d-mono.Tests/ActionManagerTest/RemoveTest.cs b/Tests/cocos2d-mono.Tests/ActionManagerTest/RemoveTest.cs index 36f4e21d..982de403 100644 --- a/Tests/cocos2d-mono.Tests/ActionManagerTest/RemoveTest.cs +++ b/Tests/cocos2d-mono.Tests/ActionManagerTest/RemoveTest.cs @@ -47,7 +47,7 @@ public override void OnEnter() public void stopAction() { CCNode pSprite = GetChildByTag(kTagGrossini); - pSprite.StopActionByTag((int)KTag.kTagSequence); + pSprite.StopAction((int)KTag.kTagSequence); } } } diff --git a/Tests/cocos2d-mono.Tests/ActionsEaseTest/EaseActionsTest.cs b/Tests/cocos2d-mono.Tests/ActionsEaseTest/EaseActionsTest.cs index 1d346ec4..bad39852 100644 --- a/Tests/cocos2d-mono.Tests/ActionsEaseTest/EaseActionsTest.cs +++ b/Tests/cocos2d-mono.Tests/ActionsEaseTest/EaseActionsTest.cs @@ -129,9 +129,9 @@ public override String title() public void testStopAction(float dt) { Unschedule(testStopAction); - m_kathia.StopActionByTag(1); - m_tamara.StopActionByTag(1); - m_grossini.StopActionByTag(1); + m_kathia.StopAction(1); + m_tamara.StopAction(1); + m_grossini.StopAction(1); } } @@ -546,9 +546,9 @@ public override void OnEnter() public void altertime(float dt) { - var action1 = (CCSpeed) (m_grossini.GetActionByTag(EaseTest.kTagAction1)); - var action2 = (CCSpeed) (m_tamara.GetActionByTag(EaseTest.kTagAction1)); - var action3 = (CCSpeed) (m_kathia.GetActionByTag(EaseTest.kTagAction1)); + var action1 = (CCSpeed) (m_grossini.GetAction(EaseTest.kTagAction1)); + var action2 = (CCSpeed) (m_tamara.GetAction(EaseTest.kTagAction1)); + var action3 = (CCSpeed) (m_kathia.GetAction(EaseTest.kTagAction1)); action1.Speed = CCRandom.Float_0_1() * 2; action2.Speed = CCRandom.Float_0_1() * 2; diff --git a/Tests/cocos2d-mono.Tests/BugsTest/Bug-458/Bug-458.cs b/Tests/cocos2d-mono.Tests/BugsTest/Bug-458/Bug-458.cs index 83ab72dd..e17a57fa 100644 --- a/Tests/cocos2d-mono.Tests/BugsTest/Bug-458/Bug-458.cs +++ b/Tests/cocos2d-mono.Tests/BugsTest/Bug-458/Bug-458.cs @@ -31,7 +31,7 @@ public override bool Init() CCLayerColor layer2 = new CCLayerColor(new CCColor4B(255, 0, 0, 255), 100, 100); CCMenuItemSprite sprite2 = new CCMenuItemSprite(layer, layer2, this, selectAnswer); CCMenu menu = new CCMenu(sprite, sprite2, null); - menu.AlignItemsVerticallyWithPadding(100); + menu.AlignItemsVertically(100); menu.Position = new CCPoint(size.Width / 2, size.Height / 2); // add the label as a child to this Layer diff --git a/Tests/cocos2d-mono.Tests/LabelTest/BitmapFontMultiLineAlignment.cs b/Tests/cocos2d-mono.Tests/LabelTest/BitmapFontMultiLineAlignment.cs index 03b892ed..99f01692 100644 --- a/Tests/cocos2d-mono.Tests/LabelTest/BitmapFontMultiLineAlignment.cs +++ b/Tests/cocos2d-mono.Tests/LabelTest/BitmapFontMultiLineAlignment.cs @@ -66,7 +66,7 @@ public BitmapFontMultiLineAlignment() CCMenuItemFont center = new CCMenuItemFont("Center", alignmentChanged); CCMenuItemFont right = new CCMenuItemFont("Right", alignmentChanged); CCMenu alignmentMenu = new CCMenu(left, center, right); - alignmentMenu.AlignItemsHorizontallyWithPadding(alignmentItemPadding); + alignmentMenu.AlignItemsHorizontally(alignmentItemPadding); center.Color = CCTypes.CCRed; m_pLastAlignmentItem = center; diff --git a/Tests/cocos2d-mono.Tests/LabelTest/LabelTTFTest.cs b/Tests/cocos2d-mono.Tests/LabelTest/LabelTTFTest.cs index 50df5a8e..ab648690 100644 --- a/Tests/cocos2d-mono.Tests/LabelTest/LabelTTFTest.cs +++ b/Tests/cocos2d-mono.Tests/LabelTest/LabelTTFTest.cs @@ -26,7 +26,7 @@ public LabelTTFTest() new CCMenuItemFont("Center", setAlignmentCenter), new CCMenuItemFont("Right", setAlignmentRight) ); - menu.AlignItemsVerticallyWithPadding(4); + menu.AlignItemsVertically(4); menu.Position = new CCPoint(50, s.Height / 2 - 20); AddChild(menu); @@ -35,7 +35,7 @@ public LabelTTFTest() new CCMenuItemFont("Middle", setAlignmentMiddle), new CCMenuItemFont("Bottom", setAlignmentBottom) ); - menu.AlignItemsVerticallyWithPadding(4); + menu.AlignItemsVertically(4); menu.Position = new CCPoint(s.Width - 50, s.Height / 2 - 20); AddChild(menu); diff --git a/Tests/cocos2d-mono.Tests/MenuTest/MenuLayer2.cs b/Tests/cocos2d-mono.Tests/MenuTest/MenuLayer2.cs index dcc37566..fc4c5adb 100644 --- a/Tests/cocos2d-mono.Tests/MenuTest/MenuLayer2.cs +++ b/Tests/cocos2d-mono.Tests/MenuTest/MenuLayer2.cs @@ -60,7 +60,7 @@ protected void alignMenusH() else { // TIP: but padding is configurable - menu.AlignItemsHorizontallyWithPadding(40); + menu.AlignItemsHorizontally(40); CCPoint p = menu.Position; menu.Position = new CCPoint(p.X - 0, p.Y - 30); } @@ -82,7 +82,7 @@ protected void alignMenusV() else { // TIP: but padding is configurable - menu.AlignItemsVerticallyWithPadding(40); + menu.AlignItemsVertically(40); CCPoint p = menu.Position; menu.Position = new CCPoint(p.X - 100, p.Y); } diff --git a/Tests/cocos2d-mono.Tests/MenuTest/MenuLayerPriorityTest.cs b/Tests/cocos2d-mono.Tests/MenuTest/MenuLayerPriorityTest.cs index 8320e0ef..7d3b4c99 100644 --- a/Tests/cocos2d-mono.Tests/MenuTest/MenuLayerPriorityTest.cs +++ b/Tests/cocos2d-mono.Tests/MenuTest/MenuLayerPriorityTest.cs @@ -51,7 +51,7 @@ public MenuLayerPriorityTest() m_pMenu1.AddChild(item1); m_pMenu1.AddChild(item2); - m_pMenu1.AlignItemsVerticallyWithPadding(2); + m_pMenu1.AlignItemsVertically(2); AddChild(m_pMenu1); diff --git a/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer1.cs b/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer1.cs index ff12f976..e977d4e2 100644 --- a/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer1.cs +++ b/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer1.cs @@ -39,7 +39,7 @@ public override void OnEnter() CCLog.Log("SceneTestLayer1#onEnter"); base.OnEnter(); _PopMenuItem.Visible = CCDirector.SharedDirector.CanPopScene; - _TheMenu.AlignItemsVerticallyWithPadding(12f); + _TheMenu.AlignItemsVertically(12f); } public override void OnEnterTransitionDidFinish() diff --git a/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer2.cs b/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer2.cs index 4608e560..82b60bc3 100644 --- a/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer2.cs +++ b/Tests/cocos2d-mono.Tests/SceneTest/SceneTestLayer2.cs @@ -55,7 +55,7 @@ public override void OnEnter() CCLog.Log("SceneTestLayer2#onEnter"); base.OnEnter(); _PopMenuItem.Visible = CCDirector.SharedDirector.CanPopScene; - _TheMenu.AlignItemsVerticallyWithPadding(12f); + _TheMenu.AlignItemsVertically(12f); } public void onReplaceScene(object pSender) diff --git a/cocos2d/actions/CCActionManager.cs b/cocos2d/actions/CCActionManager.cs index 60bc17e0..42ae97a3 100644 --- a/cocos2d/actions/CCActionManager.cs +++ b/cocos2d/actions/CCActionManager.cs @@ -298,7 +298,7 @@ public void RemoveActionByTag(int tag, CCNode target) } } - public CCAction GetActionByTag(int tag, CCNode target) + public CCAction GetAction(int tag, CCNode target) { Debug.Assert(tag != CCAction.kInvalidTag); @@ -317,12 +317,12 @@ public CCAction GetActionByTag(int tag, CCNode target) return action; } } - CCLog.Log("cocos2d : getActionByTag: Tag " + tag + " not found"); + CCLog.Log("cocos2d : GetAction: Tag " + tag + " not found"); } } else { - CCLog.Log("cocos2d : getActionByTag: Target not found"); + CCLog.Log("cocos2d : GetAction: Target not found"); } return null; } diff --git a/cocos2d/base_nodes/CCNode.cs b/cocos2d/base_nodes/CCNode.cs index 881edbb5..a67dd09c 100644 --- a/cocos2d/base_nodes/CCNode.cs +++ b/cocos2d/base_nodes/CCNode.cs @@ -1646,7 +1646,7 @@ public void StopAction(int tag) public CCAction GetAction(int tag) { Debug.Assert(tag != (int) CCNodeTag.Invalid, "Invalid tag"); - return m_pActionManager.GetActionByTag(tag, this); + return m_pActionManager.GetAction(tag, this); } public int NumberOfRunningActions()