Change package data format to binary. Editor version 3.9.0 with 'bina…

…ry format' option checked is required to generating this kind of format. Old XML format is not supported in this branch anymore.
fairygui · Sep 6, 2018 · 4612ff3 · 4612ff3
1 parent 18f407f
commit 4612ff3
Show file tree

Hide file tree

Showing 173 changed files with 2,301 additions and 3,999 deletions.
diff --git a/Examples/Classes/BagWindow.cpp b/Examples/Classes/BagWindow.cpp
@@ -1,5 +1,7 @@
 #include "BagWindow.h"
 
+USING_NS_CC;
+
 void BagWindow::onInit()
 {
     setContentPane(UIPackage::createObject("Bag", "BagWin")->as<GComponent>());

diff --git a/Examples/Classes/MailItem.cpp b/Examples/Classes/MailItem.cpp
@@ -1,9 +1,7 @@
 #include "MailItem.h"
 
-void MailItem::constructFromXML(TXMLElement *xml)
+void MailItem::onConstruct()
 {
-    GButton::constructFromXML(xml);
-
     _timeText = getChild("timeText")->as<GTextField>();
     _readController = getController("IsRead");
     _fetchController = getController("c1");

diff --git a/Examples/Classes/MailItem.h b/Examples/Classes/MailItem.h
@@ -16,7 +16,7 @@ class MailItem : public GButton
     void playEffect(float delay);
 
 protected:
-    virtual void constructFromXML(TXMLElement*);
+    virtual void onConstruct() override;
 
     GTextField* _timeText;
     GController* _readController;

diff --git a/Examples/Classes/PullToRefreshScene.cpp b/Examples/Classes/PullToRefreshScene.cpp
@@ -13,17 +13,15 @@ class ScrollPaneHeader : public GComponent
     }
     void setRefreshStatus(int value);
 protected:
-    virtual void constructFromXML(TXMLElement*);
+    virtual void onConstruct();
 private:
     void onSizeChanged(EventContext*);
 
     GController* _c1;
 };
 
-void ScrollPaneHeader::constructFromXML(TXMLElement* xml)
+void ScrollPaneHeader::onConstruct()
 {
-    GComponent::constructFromXML(xml);
-
     _c1 = getController("c1");
 
     addEventListener(UIEventType::SizeChange, CC_CALLBACK_1(ScrollPaneHeader::onSizeChanged, this));

diff --git a/Examples/Classes/Window1.cpp b/Examples/Classes/Window1.cpp
@@ -1,5 +1,7 @@
 #include "Window1.h"
 
+USING_NS_CC;
+
 void Window1::onInit()
 {
     setContentPane(UIPackage::createObject("Basics", "WindowA")->as<GComponent>());

diff --git a/Examples/Classes/Window2.cpp b/Examples/Classes/Window2.cpp
@@ -1,5 +1,7 @@
 #include "Window2.h"
 
+USING_NS_CC;
+
 void Window2::onInit()
 {
     setContentPane(UIPackage::createObject("Basics", "WindowB")->as<GComponent>());

diff --git a/Examples/Resources/UI/Bag.bytes b/Examples/Resources/UI/Bag.bytes
diff --git a/Examples/Resources/UI/Bag.fui b/Examples/Resources/UI/Bag.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Bag_atlas0.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Bag_atlas0.png
diff --git a/Examples/Resources/UI/Basics.bytes b/Examples/Resources/UI/Basics.bytes
diff --git a/Examples/Resources/UI/Basics.fui b/Examples/Resources/UI/Basics.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_atlas0.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_atlas0.png
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_atlas1.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_atlas1.png
diff --git a/...ples/Resources/UI/Basics@atlas_fjqr7k.png → ...ples/Resources/UI/Basics_atlas_fjqr7k.png b/...ples/Resources/UI/Basics@atlas_fjqr7k.png → ...ples/Resources/UI/Basics_atlas_fjqr7k.png
diff --git a/...ples/Resources/UI/Basics@atlas_nz0z20.png → ...ples/Resources/UI/Basics_atlas_nz0z20.png b/...ples/Resources/UI/Basics@atlas_nz0z20.png → ...ples/Resources/UI/Basics_atlas_nz0z20.png
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_gojg7u.mp3 b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_gojg7u.mp3
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_o4lt7w.mp3 b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Basics_o4lt7w.mp3
diff --git a/Examples/Resources/UI/Cooldown.fui b/Examples/Resources/UI/Cooldown.fui
diff --git a/Examples/Resources/UI/Cooldown_atlas0.png b/Examples/Resources/UI/Cooldown_atlas0.png
diff --git a/Examples/Resources/UI/Emoji.bytes b/Examples/Resources/UI/Emoji.bytes
diff --git a/Examples/Resources/UI/Emoji.fui b/Examples/Resources/UI/Emoji.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Emoji_atlas0.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Emoji_atlas0.png
diff --git a/Examples/Resources/UI/Extension.bytes b/Examples/Resources/UI/Extension.bytes
diff --git a/Examples/Resources/UI/Extension.fui b/Examples/Resources/UI/Extension.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Extension_atlas0.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Extension_atlas0.png
diff --git a/Examples/Resources/UI/Guide.bytes b/Examples/Resources/UI/Guide.bytes
diff --git a/Examples/Resources/UI/Guide.fui b/Examples/Resources/UI/Guide.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]
diff --git a/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Guide_atlas0.png b/Examples/Resources/UI/[email protected] → Examples/Resources/UI/Guide_atlas0.png
diff --git a/Examples/Resources/UI/HitTest.bytes b/Examples/Resources/UI/HitTest.bytes
diff --git a/Examples/Resources/UI/HitTest.fui b/Examples/Resources/UI/HitTest.fui
diff --git a/Examples/Resources/UI/[email protected] b/Examples/Resources/UI/[email protected]