From 2c5b9b668707b6eec6bb8cff7a0d9fbbfa5e51b8 Mon Sep 17 00:00:00 2001
From: nkligang <nkligang@163.com>
Date: Mon, 6 Oct 2014 19:29:36 +0800
Subject: [PATCH] modify sample ccbs

modify sample ccbs
---
 samples/demo/assets/ccb/CCScrollView.ccb  | 239 +++++++++++++++++++++-
 samples/demo/assets/ccb/CCScrollView.ccbi | Bin 1064 -> 1195 bytes
 samples/demo/assets/ccb/SubPanel.ccb      |  12 --
 samples/demo/assets/ccb/SubPanel.ccbi     | Bin 1000 -> 994 bytes
 4 files changed, 236 insertions(+), 15 deletions(-)

diff --git a/samples/demo/assets/ccb/CCScrollView.ccb b/samples/demo/assets/ccb/CCScrollView.ccb
index 0de3275..75ecdee 100644
--- a/samples/demo/assets/ccb/CCScrollView.ccb
+++ b/samples/demo/assets/ccb/CCScrollView.ccb
@@ -702,7 +702,7 @@
 								<key>type</key>
 								<string>IntegerLabeled</string>
 								<key>value</key>
-								<integer>2</integer>
+								<integer>1</integer>
 							</dict>
 							<dict>
 								<key>name</key>
@@ -740,8 +740,8 @@
 						<string>Position</string>
 						<key>value</key>
 						<array>
-							<real>56</real>
-							<real>144</real>
+							<real>0.0</real>
+							<real>107</real>
 							<integer>0</integer>
 						</array>
 					</dict>
@@ -862,6 +862,239 @@
 					</dict>
 				</array>
 			</dict>
+			<dict>
+				<key>baseClass</key>
+				<string>CCLayerColor</string>
+				<key>children</key>
+				<array>
+					<dict>
+						<key>baseClass</key>
+						<string>CCScrollView</string>
+						<key>children</key>
+						<array/>
+						<key>customClass</key>
+						<string></string>
+						<key>displayName</key>
+						<string>CCScrollView</string>
+						<key>memberVarAssignmentName</key>
+						<string>list</string>
+						<key>memberVarAssignmentType</key>
+						<integer>1</integer>
+						<key>properties</key>
+						<array>
+							<dict>
+								<key>name</key>
+								<string>contentSize</string>
+								<key>type</key>
+								<string>Size</string>
+								<key>value</key>
+								<array>
+									<real>120</real>
+									<real>240</real>
+									<integer>0</integer>
+								</array>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>anchorPoint</string>
+								<key>type</key>
+								<string>Point</string>
+								<key>value</key>
+								<array>
+									<real>0.5</real>
+									<real>0.5</real>
+								</array>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>scale</string>
+								<key>type</key>
+								<string>Float</string>
+								<key>value</key>
+								<real>1</real>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>ignoreAnchorPointForPosition</string>
+								<key>type</key>
+								<string>Check</string>
+								<key>value</key>
+								<true/>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>container</string>
+								<key>type</key>
+								<string>CCBFile</string>
+								<key>value</key>
+								<string>ccb/SubPanel.ccb</string>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>direction</string>
+								<key>type</key>
+								<string>IntegerLabeled</string>
+								<key>value</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>clipsToBounds</string>
+								<key>type</key>
+								<string>Check</string>
+								<key>value</key>
+								<false/>
+							</dict>
+							<dict>
+								<key>name</key>
+								<string>bounces</string>
+								<key>type</key>
+								<string>Check</string>
+								<key>value</key>
+								<false/>
+							</dict>
+						</array>
+					</dict>
+				</array>
+				<key>customClass</key>
+				<string></string>
+				<key>displayName</key>
+				<string>CCLayerColor</string>
+				<key>memberVarAssignmentName</key>
+				<string></string>
+				<key>memberVarAssignmentType</key>
+				<integer>0</integer>
+				<key>properties</key>
+				<array>
+					<dict>
+						<key>name</key>
+						<string>position</string>
+						<key>type</key>
+						<string>Position</string>
+						<key>value</key>
+						<array>
+							<real>180</real>
+							<real>58</real>
+							<integer>0</integer>
+						</array>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>contentSize</string>
+						<key>type</key>
+						<string>Size</string>
+						<key>value</key>
+						<array>
+							<real>120</real>
+							<real>240</real>
+							<integer>0</integer>
+						</array>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>anchorPoint</string>
+						<key>type</key>
+						<string>Point</string>
+						<key>value</key>
+						<array>
+							<real>0.5</real>
+							<real>0.5</real>
+						</array>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>scale</string>
+						<key>type</key>
+						<string>ScaleLock</string>
+						<key>value</key>
+						<array>
+							<real>1</real>
+							<real>1</real>
+							<false/>
+							<integer>0</integer>
+						</array>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>ignoreAnchorPointForPosition</string>
+						<key>type</key>
+						<string>Check</string>
+						<key>value</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>touchEnabled</string>
+						<key>platform</key>
+						<string>iOS</string>
+						<key>type</key>
+						<string>Check</string>
+						<key>value</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>accelerometerEnabled</string>
+						<key>platform</key>
+						<string>iOS</string>
+						<key>type</key>
+						<string>Check</string>
+						<key>value</key>
+						<false/>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>mouseEnabled</string>
+						<key>platform</key>
+						<string>Mac</string>
+						<key>type</key>
+						<string>Check</string>
+						<key>value</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>keyboardEnabled</string>
+						<key>platform</key>
+						<string>Mac</string>
+						<key>type</key>
+						<string>Check</string>
+						<key>value</key>
+						<false/>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>color</string>
+						<key>type</key>
+						<string>Color3</string>
+						<key>value</key>
+						<array>
+							<integer>254</integer>
+							<integer>255</integer>
+							<integer>255</integer>
+						</array>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>opacity</string>
+						<key>type</key>
+						<string>Byte</string>
+						<key>value</key>
+						<integer>255</integer>
+					</dict>
+					<dict>
+						<key>name</key>
+						<string>blendFunc</string>
+						<key>type</key>
+						<string>Blendmode</string>
+						<key>value</key>
+						<array>
+							<integer>770</integer>
+							<integer>771</integer>
+						</array>
+					</dict>
+				</array>
+			</dict>
 		</array>
 		<key>customClass</key>
 		<string>PbCCScrollView</string>
diff --git a/samples/demo/assets/ccb/CCScrollView.ccbi b/samples/demo/assets/ccb/CCScrollView.ccbi
index 18b96e1d3251c5f3ea5e9c01e61f4cd9d1c59ef0..d6c87fab4023ef3e244714f55aea9a523960555d 100644
GIT binary patch
delta 353
zcmZ`!u}Z^G6g}s?5EBR(uww001u+WRfQz`sY6piv7dJ`M2L@uSv6Xi76Dsc~1P7g+
zT-^HuPJV#>1ASG&rE>3Z@8z6(&bfCU-0|DpwAOIDS*g-~c3Hqr(@vv3=)_5(@?EpQ
ziK2F|%=!uoQFM}wRH<FARlRO@-OH2FQJGvQxGk06sD73v`i$?=n?N^3-FpH;)&-{&
zp}rCawF$@yZ5vWngqayw;Q0)uU&R)wKg1?Oy&?~n#>A&jpMZhe6hkrAh1^(;%^}za
zgR0@5ezyl$w*&ns_x@q6Z^tw>k7;3t*2^+Q#r!z7u&AG9(3~R<w*El;$>5j_vjic0
M;8%ji9E>^e3l^_L4FCWD

delta 241
zcmZ3@xq@TDT>%bf=iq{(%#u_Fc4udw#L9`cWGAaLDkyWNWEQ0+mt^MWG4P~h78m3s
zR=O1>=B6@mdZgx*rIutSCr)N$6rP;G_=s6VfN`=blLC(cBf|wo1t!K1j7%3M7cyB%
z2{1A;iZHUVF)%ZWFfjl*8Y~Qq86ahok1}a8GE9EYq|SI@vN*GgZ~!C2e*wk`j0_Aw
z<!p>h6-)t>^O#j-41fX}77UCU5<vYCV8p|~azK!Ufs=9a8fIf08kGb$Fa|IJHH*MC
F0|5G8Gg|-v

diff --git a/samples/demo/assets/ccb/SubPanel.ccb b/samples/demo/assets/ccb/SubPanel.ccb
index a34c26b..50be13b 100644
--- a/samples/demo/assets/ccb/SubPanel.ccb
+++ b/samples/demo/assets/ccb/SubPanel.ccb
@@ -37,18 +37,6 @@
 				<integer>0</integer>
 				<key>properties</key>
 				<array>
-					<dict>
-						<key>name</key>
-						<string>position</string>
-						<key>type</key>
-						<string>Position</string>
-						<key>value</key>
-						<array>
-							<real>0.0</real>
-							<real>1</real>
-							<integer>0</integer>
-						</array>
-					</dict>
 					<dict>
 						<key>name</key>
 						<string>contentSize</string>
diff --git a/samples/demo/assets/ccb/SubPanel.ccbi b/samples/demo/assets/ccb/SubPanel.ccbi
index f97ed9f1cdced9f88b20acd9fe9bb26eaa436bc8..a086d8b9983658f9514e2587e4e82c5b59f45666 100644
GIT binary patch
delta 90
zcmaFC{)l~otq{Ajvrl4WY7qlRL4I*&NoIcDM*m($Mv=*P8BG`^CO=@*ne4)(z{oQ>
ol_>&9?ql)+lHAO4Kowfd!9aE$vlEvHqXHWvBMT#tdx}{O0LF?I@&Et;

delta 147
zcmaFF{(^mitq?~+esN|=W_}(6yR)-TVr6R4M*m($MxM!c8BN$D7#T$v7#Jr%VAPpx
z$E3h0GC7_p0!Z#)@=*|BU`<b(=fuL`&B(~c#=yWJ!o<MH$f&`>z`!KH$iy>Qg*h0g
rw1U}5gNIRpjggTBWEe|B4NF5ZBTy|X14Dxym|!$uP+(!$z{m&y1+g47