diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems index aceead4b72..10b8def046 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems @@ -42,6 +42,9 @@ + + + @@ -251,19 +254,31 @@ + + + + + + + + + + + + @@ -480,6 +495,12 @@ + + + + + + @@ -651,18 +672,29 @@ + + + + + + + + + + + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters index a01ad4cdf3..425b0c33e5 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters @@ -1306,6 +1306,51 @@ base + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json + + + cocostudio\json + + + cocostudio\json + + + cocostudio\reader\WidgetReader\ComAudioReader + + + cocostudio\reader\WidgetReader\GameMapReader + + + cocostudio\reader\WidgetReader\NodeReader + + + cocostudio\reader\WidgetReader\SpriteReader\SingleNodeReader + + + cocostudio\reader\WidgetReader\SpriteReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader\ParticleReader + + + cocostudio\reader\WidgetReader\ProjectNodeReader + @@ -2369,6 +2414,57 @@ base + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json\flatbuffers + + + cocostudio\json + + + cocostudio\json + + + cocostudio\reader\WidgetReader\ComAudioReader + + + cocostudio\reader\WidgetReader\GameMapReader + + + cocostudio\reader\WidgetReader\NodeReader + + + cocostudio\reader\WidgetReader\SpriteReader\SingleNodeReader + + + cocostudio\reader\WidgetReader\SpriteReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader + + + cocostudio\reader\WidgetReader\ParticleReader + + + cocostudio\reader\WidgetReader\ProjectNodeReader + @@ -2593,6 +2689,30 @@ {b16255cc-6a35-4ee4-b77b-46a781b40d9b} + + {ea248cf4-798f-418c-8beb-39c9c864a802} + + + {a9889035-45b0-4671-97a0-61df5b0d9283} + + + {9020bd24-1e83-4a61-98ce-3727c6677cc9} + + + {c98f9dbc-048a-4efe-95eb-a0867f320928} + + + {1b632e54-5bd0-4d5b-98b2-8d656f96fa5d} + + + {0bffceb2-5483-4697-a6d6-4e56f469e0af} + + + {b6756a21-fab2-49e2-94ee-8100c134e797} + + + {a6638f35-5c81-4835-9897-0f9efb0be02b} + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj index 3fe1aafa3c..97d15dd2bb 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -408,6 +408,7 @@ + @@ -648,7 +649,6 @@ - @@ -897,6 +897,7 @@ + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters index 5423782689..ec9b507d90 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj.filters +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -257,6 +257,9 @@ {fa1426ae-957e-4d62-82c2-9f55e7fbc524} + + {02d389d5-8f57-4bd6-b12a-95af86c5b356} + @@ -1314,9 +1317,6 @@ 2d - - cocostudio\json\flatbuffers - cocostudio\json\flatbuffers @@ -1368,6 +1368,9 @@ cocostudio\json + + cocostudio\reader\WidgetReader\GameMapReader + @@ -2682,6 +2685,9 @@ cocostudio\json + + cocostudio\reader\WidgetReader\GameMapReader + diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp index 9a96ae6328..2764026e8f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp @@ -78,7 +78,8 @@ namespace cocostudio Vec2 position = Vec2::ZERO; Vec2 scale = Vec2(1.0f, 1.0f); Vec2 anchorPoint = Vec2::ZERO; - Color4B color = { 255, 255, 255, 255 }; + Color4B color(255, 255, 255, 255); + Vec2 size = Vec2::ZERO; bool flipX = false; bool flipY = false;