diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp index dee4b016ff..4d3bc42d79 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp @@ -41,7 +41,7 @@ bool UIButtonTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIButton/crossplatform_UIButton_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIButton/res.csb"); Node* child = node->getChildByTag(4); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp index 16634e18a5..2b6d1a557c 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp @@ -36,7 +36,7 @@ bool UICheckBoxTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UICheckBox/crossplatform_UICheckBox_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UICheckBox/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp index 4c1d618317..a5a9bce809 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp @@ -13,7 +13,7 @@ bool UIImageViewTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIImageView/crossplatform_UIImageView_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIImageView/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp index 0f88262e3a..cf48ee6160 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp @@ -34,7 +34,7 @@ bool UILayoutTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Layout/crossplatform_UILayout_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Layout/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -65,7 +65,7 @@ bool UILayoutTest_Color_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Color/crossplatform_UILayout_Color_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Color/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -96,7 +96,7 @@ bool UILayoutTest_Gradient_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Gradient_Color/crossplatform_Gradient_Color.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Gradient_Color/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -127,7 +127,7 @@ bool UILayoutTest_BackGroundImage_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/BackgroundImage/crossplatform_BackgroundImage.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/BackgroundImage/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -158,7 +158,7 @@ bool UILayoutTest_BackGroundImage_Scale9_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/crossplatform_Scale9_BackgroundImage.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -196,7 +196,7 @@ bool UILayoutTest_Layout_Linear_Vertical_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/windows_ui_linear_vertical_layout.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/res.json")); _touchGroup->addChild(_layout); @@ -225,7 +225,7 @@ bool UILayoutTest_Layout_Linear_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/windows_ui_linear_horizontal_layout.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/res.json")); _touchGroup->addChild(_layout); this->configureGUIScene(); @@ -253,7 +253,7 @@ bool UILayoutTest_Layout_Relative_Align_Parent_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Relative_Align_Parent/windows_ui_relative_align_parent.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Relative_Align_Parent/res.json")); _touchGroup->addChild(_layout); this->configureGUIScene(); @@ -280,7 +280,7 @@ bool UILayoutTest_Layout_Relative_Location_Editor::init() { if (UIScene_Editor::init()) { - _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Relative_Align_Location/windows_ui_relative_align_location.json")); + _layout = static_cast(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UILayout/Relative_Align_Location/res.json")); _touchGroup->addChild(_layout); this->configureGUIScene(); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp index b44fdf589b..db674baa1d 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp @@ -26,7 +26,7 @@ bool UIListViewTest_Vertical_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIListView/New/crossplatform_UIListView_Editor_Vertical.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIListView/New/resV.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = dynamic_cast(child); @@ -117,7 +117,7 @@ bool UIListViewTest_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIListView/New/crossplatform_UIListView_Editor_Horizontal.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIListView/New/resH.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = dynamic_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp index 956ce50c73..d7bdd1ac40 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp @@ -39,7 +39,7 @@ bool UILoadingBarTest_Editor::init() { scheduleUpdate(); - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILoadingBar/crossplatform_UILoadingBar_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILoadingBar/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp index dec0c59b5a..ed903376b4 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp @@ -26,7 +26,7 @@ bool UIPageViewTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIPageView/crossplatform_UIPageView_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIPageView/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp index d4dfcd6dba..37c7ba913e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp @@ -29,7 +29,7 @@ bool UIScrollViewTest_Vertical_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Vertical/crossplatform_UIScrollView_Vertical_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Vertical/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -60,7 +60,7 @@ bool UIScrollViewTest_Horizontal_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Horizontal/crossplatform_UIScrollView_Horizontal_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Horizontal/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); @@ -91,7 +91,7 @@ bool UIScrollViewTest_Both_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Both/crossplatform_UIScrollView_Both_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIScrollView/Both/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp index 28793e1fa6..ac2ad352b9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp @@ -35,7 +35,7 @@ bool UISliderTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UISlider/crossplatform_UISlider_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UISlider/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp index accd776781..cb2ccfc9c8 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp @@ -12,7 +12,7 @@ bool UITextAtlasTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabelAtlas/crossplatform_UILabelAtlas_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabelAtlas/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp index 3926564b6d..3378c6354e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp @@ -14,7 +14,7 @@ bool UITextBMFontTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabelBMFont/crossplatform_UILabelBMFont_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabelBMFont/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp index 7e6939ceca..8a16460de7 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp @@ -37,7 +37,7 @@ bool UITextFieldTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UITextField/crossplatform_UITextField_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UITextField/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp index 0c6bf27e40..7aa91e7160 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp @@ -14,7 +14,7 @@ bool UITextTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabel/crossplatform_UILabel_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UILabel/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp index cc0110297b..b8b82678e9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp @@ -41,7 +41,7 @@ bool UIWidgetAddNodeTest_Editor::init() { if (UIScene_Editor::init()) { - Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIWidgetAddNode/crossplatform_UIWidgetAddNode_Editor_1.csb"); + Node* node = CSLoader::createNode("cocosui/UIEditorTest/UIWidgetAddNode/res.csb"); Node* child = node->getChildByTag(5); child->removeFromParent(); _layout = static_cast(child); diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res index afa5ba56b3..0f5e0dff1a 160000 --- a/tests/cpp-tests/Resources/ccs-res +++ b/tests/cpp-tests/Resources/ccs-res @@ -1 +1 @@ -Subproject commit afa5ba56b3745b0fb94e730ea54a79e598c31ba8 +Subproject commit 0f5e0dff1a7545eef7bbe8f23d4b232d0d2d6ae3