Commit b0c4be4d b0c4be4d8a41fbc0b8eef67bf1615be153ed2471 by jinwawa

0604

1 parent 401b0fe1
No preview for this file type
...@@ -120,6 +120,53 @@ ...@@ -120,6 +120,53 @@
120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" /> 120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" /> 121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" /> 122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
123 <shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
124 <shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
125 <shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
126 <shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
127 <shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
128 <shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
129 <shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
130 <shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
131 <shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
132 <shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
133 <shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
134 <shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
135 <shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
136 <shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
137 <shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
138 <shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
139 <shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
140 <shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
141 <shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
142 <shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
143 <shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
144 <shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
145 <shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
146 <shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
147 <shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
148 <shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
149 <shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
150 <shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
151 <shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
152 <shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
153 <shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
154 <shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
155 <shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
156 <shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
157 <shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
158 <shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
159 <shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
160 <shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
161 <shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
162 <shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
163 <shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
164 <shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
165 <shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
166 <shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
167 <shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
168
169
123 170
124 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" /> 171 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
125 172
......
No preview for this file type
...@@ -120,6 +120,53 @@ ...@@ -120,6 +120,53 @@
120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" /> 120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" /> 121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" /> 122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
123 <shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
124 <shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
125 <shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
126 <shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
127 <shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
128 <shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
129 <shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
130 <shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
131 <shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
132 <shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
133 <shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
134 <shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
135 <shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
136 <shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
137 <shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
138 <shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
139 <shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
140 <shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
141 <shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
142 <shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
143 <shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
144 <shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
145 <shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
146 <shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
147 <shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
148 <shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
149 <shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
150 <shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
151 <shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
152 <shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
153 <shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
154 <shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
155 <shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
156 <shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
157 <shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
158 <shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
159 <shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
160 <shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
161 <shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
162 <shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
163 <shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
164 <shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
165 <shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
166 <shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
167 <shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
168
169
123 170
124 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" /> 171 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
125 172
......
No preview for this file type
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/> 41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/>
42 <pay id="201" name="月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/> 42 <pay id="201" name="月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/>
43 <pay id="202" name="年卡(365天)" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/> 43 <pay id="202" name="年卡(365天)" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
44 <pay id="301" name="自动续包月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020@207" productPuTao="qjqp999" notice="1"/> 44 <pay id="301" name="自动续包月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
45 </platform> 45 </platform>
46 </root> 46 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -120,6 +120,53 @@ ...@@ -120,6 +120,53 @@
120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" /> 120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" /> 121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" /> 122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
123 <shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
124 <shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
125 <shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
126 <shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
127 <shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
128 <shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
129 <shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
130 <shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
131 <shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
132 <shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
133 <shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
134 <shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
135 <shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
136 <shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
137 <shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
138 <shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
139 <shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
140 <shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
141 <shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
142 <shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
143 <shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
144 <shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
145 <shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
146 <shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
147 <shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
148 <shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
149 <shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
150 <shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
151 <shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
152 <shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
153 <shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
154 <shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
155 <shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
156 <shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
157 <shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
158 <shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
159 <shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
160 <shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
161 <shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
162 <shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
163 <shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
164 <shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
165 <shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
166 <shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
167 <shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
168
169
123 170
124 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" /> 171 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
125 172
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800278b87c7</Account> 6 <Account>m0800278b87c8</Account>
7 <exp>0</exp> 7 <exp>0</exp>
8 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
9 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
29 <uid>1030100010142918</uid> 29 <uid>1030100010142892</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
1 xcopy %cd%\res E:\AndroidProject\XhxAndroid_cucc\assets\res /E/I/Y 1 xcopy %cd%\res D:\AndroidProject\XhxAndroid_cucc\assets\res /E/I/Y
2 cocos luacompile -s %cd%\src -d E:\AndroidProject\XhxAndroid_cucc\assets\src -e -k tpdrawgdanjue -b tpdrawgd 2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_cucc\assets\src -e -k tpdrawgdanjue -b tpdrawgd
3 3
4 call xcopy %cd%\src E:\AndroidProject\XhxAndroid_cucc\assets\src /E/I/Y
...\ No newline at end of file ...\ No newline at end of file
4 call xcopy %cd%\src D:\AndroidProject\XhxAndroid_cucc\assets\src /E/I/Y
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -125,6 +125,51 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip ...@@ -125,6 +125,51 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
125 800225 萌天使缎丝鞋 萌天使缎丝鞋 0 0 0 5 0 0 1 1 125 800225 萌天使缎丝鞋 萌天使缎丝鞋 0 0 0 5 0 0 1 1
126 800226 萌天使翅膀 萌天使翅膀 0 0 0 6 0 0 1 1 126 800226 萌天使翅膀 萌天使翅膀 0 0 0 6 0 0 1 1
127 800227 萌天使手摇铃 萌天使手摇铃 0 0 0 7 0 0 1 1 127 800227 萌天使手摇铃 萌天使手摇铃 0 0 0 7 0 0 1 1
128 800231 粉小猫创可贴 粉小猫创可贴 0 0 0 1 0 0 1 0
129 800232 粉小猫发型 粉小猫发型 0 0 0 2 0 0 1 0
130 800233 粉小猫上衣 粉小猫上衣 0 0 0 3 0 0 1 0
131 800235 粉小猫鞋子 粉小猫鞋子 0 0 0 5 0 0 1 0
132 800236 天女散花 天女散花 0 0 0 6 0 0 1 0
133 800237 粉小猫手链 粉小猫手链 0 0 0 7 0 0 1 0
134 800241 新春虎头吉祥痣 新春虎头吉祥痣 0 0 0 1 0 0 1 0
135 800242 新春虎头头套 新春虎头帽 0 0 0 2 0 0 1 0
136 800243 新春虎头上衣 新春虎头衣 0 0 0 3 0 0 1 0
137 800244 新春虎头裤 新春虎头裤 0 0 0 4 0 0 1 0
138 800245 新春虎头鞋 新春虎头鞋 0 0 0 5 0 0 1 0
139 800246 新春虎头尾 新春虎头尾 0 0 0 6 0 0 1 0
140 800247 春节鞭炮 新春虎头鞭炮 0 0 0 7 0 0 1 0
141 800252 樱花妹发型 樱花妹发型 0 0 0 2 0 0 1 0
142 800253 樱花妹服 樱花妹服 0 0 0 3 0 0 1 0
143 800255 樱花妹鞋 樱花妹鞋 0 0 0 5 0 0 1 0
144 800256 樱花妹背景 樱花妹背景 0 0 0 6 0 0 1 0
145 800257 樱花妹伞 樱花妹伞 0 0 0 7 0 0 1 0
146 800262 小飞侠发型 小飞侠发型 0 0 0 2 0 0 1 0
147 800263 小飞侠上衣 小飞侠上衣 0 0 0 3 0 0 1 0
148 800264 小飞侠裤子 小飞侠裤子 0 0 0 4 0 0 1 0
149 800265 小飞侠鞋 小飞侠鞋 0 0 0 5 0 0 1 0
150 800266 小飞侠翅膀 小飞侠翅膀 0 0 0 6 0 0 1 0
151 800267 小飞侠玩具 小飞侠玩具 0 0 0 7 0 0 1 0
152 800271 原始人面饰 原始人面饰 0 0 0 1 0 0 1 0
153 800272 原始人发型 原始人发型 0 0 0 2 0 0 1 0
154 800273 原始人服饰 原始人服饰 0 0 0 3 0 0 1 0
155 800275 原始人鞋 原始人鞋 0 0 0 5 0 0 1 0
156 800277 原始人棒槌 原始人棒槌 0 0 0 7 0 0 1 0
157 800282 宇航员发型 宇航员发型 0 0 0 2 0 0 1 0
158 800283 宇航员上衣 宇航员上衣 0 0 0 3 0 0 1 0
159 800284 宇航员裤 宇航员裤 0 0 0 4 0 0 1 0
160 800285 宇航员鞋 宇航员鞋 0 0 0 5 0 0 1 0
161 800291 福尔摩斯面饰 福尔摩斯面饰 0 0 0 1 0 0 1 0
162 800292 福尔摩斯发型 福尔摩斯发型 0 0 0 2 0 0 1 0
163 800293 福尔摩斯上衣 福尔摩斯上衣 0 0 0 3 0 0 1 0
164 800294 福尔摩斯裤 福尔摩斯裤 0 0 0 4 0 0 1 0
165 800295 福尔摩斯鞋 福尔摩斯鞋 0 0 0 5 0 0 1 0
166 800297 福尔摩斯放大镜 福尔摩斯放大镜 0 0 0 7 0 0 1 0
167 800301 剑侠客面饰 剑侠客面饰 0 0 0 1 0 0 1 0
168 800302 剑侠客发型 剑侠客发型 0 0 0 2 0 0 1 0
169 800303 剑侠客上衣 剑侠客上衣 0 0 0 3 0 0 1 0
170 800304 剑侠客裤 剑侠客裤 0 0 0 4 0 0 1 0
171 800305 剑侠客鞋 剑侠客鞋 0 0 0 5 0 0 1 0
172 800307 剑侠客武器 剑侠客武器 0 0 0 7 0 0 1 0
128 800901 时尚太阳镜 时尚太阳镜 0 0 0 1 0 0 1 0 173 800901 时尚太阳镜 时尚太阳镜 0 0 0 1 0 0 1 0
129 800906 优雅蝶翼 优雅蝶翼 0 0 0 6 0 0 1 0 174 800906 优雅蝶翼 优雅蝶翼 0 0 0 6 0 0 1 0
130 910001 爱心奖牌 爱心奖牌 1 0 0 0 0 0 1 0 175 910001 爱心奖牌 爱心奖牌 1 0 0 0 0 0 1 0
......
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/> 41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/>
42 <pay id="201" name="月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/> 42 <pay id="201" name="月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/>
43 <pay id="202" name="年卡(365天)" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/> 43 <pay id="202" name="年卡(365天)" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
44 <pay id="301" name="自动续包月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020@207" productPuTao="qjqp999" notice="1"/> 44 <pay id="301" name="自动续包月卡(31天)" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
45 </platform> 45 </platform>
46 </root> 46 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -120,6 +120,53 @@ ...@@ -120,6 +120,53 @@
120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" /> 120 <shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" /> 121 <shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" /> 122 <shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
123 <shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
124 <shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
125 <shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
126 <shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
127 <shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
128 <shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
129 <shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
130 <shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
131 <shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
132 <shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
133 <shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
134 <shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
135 <shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
136 <shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
137 <shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
138 <shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
139 <shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
140 <shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
141 <shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
142 <shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
143 <shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
144 <shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
145 <shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
146 <shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
147 <shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
148 <shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
149 <shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
150 <shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
151 <shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
152 <shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
153 <shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
154 <shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
155 <shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
156 <shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
157 <shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
158 <shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
159 <shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
160 <shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
161 <shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
162 <shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
163 <shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
164 <shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
165 <shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
166 <shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
167 <shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
168
169
123 170
124 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" /> 171 <shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
125 172
......
...@@ -12,7 +12,7 @@ local shopList_5 = {}; --墙纸 ...@@ -12,7 +12,7 @@ local shopList_5 = {}; --墙纸
12 local shopList_6 = {}; --商店宠物 12 local shopList_6 = {}; --商店宠物
13 local shopList_7 = {}; --商店宠物钥匙 13 local shopList_7 = {}; --商店宠物钥匙
14 14
15 local vipList = {}; --月卡 15 local vipList = {}; --{月卡,年卡,自动续包月卡}
16 local firstPayList = {}; --首充礼包 16 local firstPayList = {}; --首充礼包
17 local dailyPayList = {}; --每日充值 17 local dailyPayList = {}; --每日充值
18 local cyclePayList = {}; --周期活动 18 local cyclePayList = {}; --周期活动
...@@ -94,6 +94,7 @@ local function init() ...@@ -94,6 +94,7 @@ local function init()
94 local info = {}; 94 local info = {};
95 info.id = tonumber(vv.attr.id); 95 info.id = tonumber(vv.attr.id);
96 info.name = vv.attr.name; 96 info.name = vv.attr.name;
97 logD("ShopInfo---------------------->"..info.name);
97 info.rmb = tonumber(vv.attr.rmb); 98 info.rmb = tonumber(vv.attr.rmb);
98 info.type = tonumber(vv.attr.type); 99 info.type = tonumber(vv.attr.type);
99 info.itemList = {}; 100 info.itemList = {};
...@@ -123,6 +124,7 @@ local function init() ...@@ -123,6 +124,7 @@ local function init()
123 local arr = StringUtil.split(vv.attr.payitem,","); 124 local arr = StringUtil.split(vv.attr.payitem,",");
124 info.payItemInfo = {id=tonumber(arr[1]),num=tonumber(arr[2])}; 125 info.payItemInfo = {id=tonumber(arr[1]),num=tonumber(arr[2])};
125 vipList[#vipList+1] = info; 126 vipList[#vipList+1] = info;
127
126 dump(vipList); 128 dump(vipList);
127 elseif info.type == 3 then 129 elseif info.type == 3 then
128 info.worth = vv.attr.worth; 130 info.worth = vv.attr.worth;
...@@ -144,6 +146,7 @@ local function init() ...@@ -144,6 +146,7 @@ local function init()
144 end 146 end
145 end 147 end
146 end 148 end
149 logD("Shopinfo--------------------->vipList"..#vipList); --2
147 table.sort(firstPayList,function (aa,bb) 150 table.sort(firstPayList,function (aa,bb)
148 return aa.id<bb.id; 151 return aa.id<bb.id;
149 end); 152 end);
......
...@@ -125,11 +125,22 @@ end ...@@ -125,11 +125,22 @@ end
125 -- },timeoutFn); 125 -- },timeoutFn);
126 --end 126 --end
127 127
128 --根据config.ini中的CHANNEL字段判断
128 function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBack,gameid) 129 function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
130 if CHANNEL == "cucc" then
131 ShopModel.payCucc(productId,productName,productPrice,callBack,timeoutCallBack,gameid);
132 elseif CHANNEL == "dangbei" then
133 ShopModel.payDangbei(productId,productName,productPrice,callBack,timeoutCallBack,gameid);
134 end
135 end
136
137 --天津联通支付
138 function ShopModel.payCucc(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
129 local function onGetPayIDSuccessFun(_params) 139 local function onGetPayIDSuccessFun(_params)
130 local data = json.decode(_params); 140 local data = json.decode(_params);
131 if data.pay_id == "" then 141 if data.pay_id == "" then
132 Alert.showOne("获取订单号失败!"); 142 --Alert.showOne("获取订单号失败!");
143 logUI("获取订单号失败!"..productId);
133 return; 144 return;
134 end 145 end
135 local tradeNo = data.pay_id; --订单号 146 local tradeNo = data.pay_id; --订单号
...@@ -188,4 +199,57 @@ function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBa ...@@ -188,4 +199,57 @@ function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBa
188 end 199 end
189 end 200 end
190 201
202 --天津联通
203 function ShopModel.payDangbei(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
204 local function onGetPayIDSuccessFun(_params)
205 local data = json.decode(_params);
206 if data.pay_id == "" then
207 Alert.showOne("获取订单号失败!");
208 return;
209 end
210 local tradeNo = data.pay_id; --订单号
211 local productId = productId; --商品ID
212 local subject = productName; --商品名称
213 local amount = productPrice; --商品价格
214 local notificationURL = data.url_callback;--回调URL
215 local zfb_url_callback = data.zfb_url_callback;--支付宝回调URL
216 local wx_url_callback = data.wx_url_callback;--微信回调URL
217 local peng_bo_shi_token = data.peng_bo_shi_token;--鹏博士密钥
218 logUI("订单号获取成功token:"..peng_bo_shi_token);
219
220 local function callbackLua(params)
221 if params == "success" then
222 if callBack then
223 callBack(params);
224 end
225 elseif params == "no" then
226 local subject = DeviceUtil.getAppName().." "..productName;
227 local reciever = require("app.views.view.QrPayView"):show({trade_no=tradeNo,subject=subject,price=productPrice,zfb_url=zfb_url_callback,wx_url=wx_url_callback,callBackFun=callBack});
228 local scene = cc.Director:getInstance():getRunningScene();
229 scene.keypadManager:addKeypadReceiver(reciever);
230 end
231 logUI(params);
232 end
233
234 local pay_params = tradeNo..","..productId..","..subject..","..amount..","..notificationURL..","..peng_bo_shi_token;
235 DeviceUtil.sendBilling(pay_params,callbackLua);
236 end
237
238 local function onGetPayIDFaildFun(params)
239 if timeoutCallBack then
240 timeoutCallBack(params);
241 end
242 end
243
244 gameid = gameid or 0;
245 gameid = tostring(gameid);
246 local get_pay_id_url = string.gsub(GAME_LOGIN_URL,"login","pay_get_id");
247 if CHANNEL == "cmcc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
248 local paramsStr = "uid="..UserModel.getStringUID().."&product="..productId.."&account="..UserModel.account.."&gameid="..gameid;
249 DeviceUtil.sendHttpRequest("POST,"..get_pay_id_url..","..PROXY_HTTP_ADDR..","..paramsStr,onGetPayIDSuccessFun);
250 else
251 HttpRequest:getInstance():post(get_pay_id_url,{uid=UserModel.getStringUID(),product=productId,account=UserModel.account,gameid=gameid},onGetPayIDSuccessFun,onGetPayIDFaildFun);
252 end
253 end
254
191 return ShopModel 255 return ShopModel
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -143,7 +143,34 @@ function DeviceUtil.authPermission(params,callbackLua) --调用android的方法 ...@@ -143,7 +143,34 @@ function DeviceUtil.authPermission(params,callbackLua) --调用android的方法
143 --luaj.callStaticMethod() 会返回两个值 143 --luaj.callStaticMethod() 会返回两个值
144 --当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有) 144 --当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有)
145 --当失败时,第一个值为 false,第二个值是错误代码 145 --当失败时,第一个值为 false,第二个值是错误代码
146 local ok,ret = luaj.callStaticMethod(className,"authPermission",args,sigs) 146 local ok,ret = luaj.callStaticMethod(className,"authPermission",args,sigs) --调用AppActivity.java代码
147 if not ok then
148 print("authPermission error:"..ret);
149 end
150 else
151 if callbackLua then
152 callbackLua("no");
153 end
154 end
155 end
156
157 --连续包月鉴权获取productId _jinwawa
158 function DeviceUtil.authPermissionForPruductId(params,callbackLua) --调用android的方法实现
159 print("DeviceUtil.authPermission:"..params);
160 local targetPlatform = cc.Application:getInstance():getTargetPlatform()
161 if targetPlatform == cc.PLATFORM_OS_ANDROID then
162 local luaj = require "cocos.cocos2d.luaj" --引入luaj
163 --包名/类名 这个可以在对应的android工程的manifest中得到
164 local className="org/cocos2dx/lua/AppActivity";
165 local args = { tostring(params),callbackLua};
166 local sigs = "(Ljava/lang/String;I)V" --传入string参数,无返回值
167
168 --luaj 调用 Java 方法时,可能会出现各种错误,因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
169 --luaj.callStaticMethod() 会返回两个值
170 --当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有)
171 --当失败时,第一个值为 false,第二个值是错误代码
172 logD("DeviceUtil----------------------->authPermissionProductId");
173 local ok,ret = luaj.callStaticMethod(className,"authPermissionForProductId",args,sigs) --调用AppActivity.java代码
147 if not ok then 174 if not ok then
148 print("authPermission error:"..ret); 175 print("authPermission error:"..ret);
149 end 176 end
...@@ -179,6 +206,7 @@ function DeviceUtil.sendBilling(params,callbackLua) --调用android的方法实 ...@@ -179,6 +206,7 @@ function DeviceUtil.sendBilling(params,callbackLua) --调用android的方法实
179 end 206 end
180 end 207 end
181 208
209 --周期性付款
182 function DeviceUtil.cycleBilling(params,callbackLua) --调用android的方法实现 210 function DeviceUtil.cycleBilling(params,callbackLua) --调用android的方法实现
183 print("DeviceUtil.cycleBilling:"..params); 211 print("DeviceUtil.cycleBilling:"..params);
184 local targetPlatform = cc.Application:getInstance():getTargetPlatform() 212 local targetPlatform = cc.Application:getInstance():getTargetPlatform()
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData"> 4 <Value ctype="GuidesData">
5 <HorizontalList> 5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="-70.0094" /> 6 <Guides Direction="Horizontal" Position="25.9645" />
7 </HorizontalList> 7 </HorizontalList>
8 <VerticalList> 8 <VerticalList>
9 <Guides Position="-220.0244" /> 9 <Guides Position="-220.0244" />
10 <Guides Position="162.4259" /> 10 <Guides Position="139.4012" />
11 <Guides Position="361.5789" /> 11 <Guides Position="361.5789" />
12 <Guides Position="618.1532" /> 12 <Guides Position="618.1532" />
13 </VerticalList> 13 </VerticalList>
......
...@@ -715,6 +715,19 @@ ...@@ -715,6 +715,19 @@
715 <OutlineColor A="255" R="255" G="0" B="0" /> 715 <OutlineColor A="255" R="255" G="0" B="0" />
716 <ShadowColor A="255" R="110" G="110" B="110" /> 716 <ShadowColor A="255" R="110" G="110" B="110" />
717 </AbstractNodeData> 717 </AbstractNodeData>
718 <AbstractNodeData Name="panel_decorate_pet" Visible="False" ActionTag="-963401781" Tag="404" IconVisible="False" LeftMargin="-0.4424" RightMargin="0.4424" TopMargin="-0.0528" BottomMargin="0.0528" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
719 <Size X="1280.0000" Y="720.0000" />
720 <AnchorPoint />
721 <Position X="-0.4424" Y="0.0528" />
722 <Scale ScaleX="1.0000" ScaleY="1.0000" />
723 <CColor A="255" R="255" G="255" B="255" />
724 <PrePosition X="-0.0003" Y="0.0001" />
725 <PreSize X="1.0000" Y="1.0000" />
726 <SingleColor A="255" R="150" G="200" B="255" />
727 <FirstColor A="255" R="150" G="200" B="255" />
728 <EndColor A="255" R="255" G="255" B="255" />
729 <ColorVector ScaleY="1.0000" />
730 </AbstractNodeData>
718 <AbstractNodeData Name="txt_id" ActionTag="548091000" Tag="2421" IconVisible="False" LeftMargin="9.7859" RightMargin="1070.2141" TopMargin="424.5339" BottomMargin="245.4661" TouchEnable="True" FontSize="50" IsCustomSize="True" LabelText="100000" PlaceHolderText="" MaxLengthText="10" ctype="TextFieldObjectData"> 731 <AbstractNodeData Name="txt_id" ActionTag="548091000" Tag="2421" IconVisible="False" LeftMargin="9.7859" RightMargin="1070.2141" TopMargin="424.5339" BottomMargin="245.4661" TouchEnable="True" FontSize="50" IsCustomSize="True" LabelText="100000" PlaceHolderText="" MaxLengthText="10" ctype="TextFieldObjectData">
719 <Size X="200.0000" Y="50.0000" /> 732 <Size X="200.0000" Y="50.0000" />
720 <AnchorPoint ScaleY="0.5000" /> 733 <AnchorPoint ScaleY="0.5000" />
...@@ -818,19 +831,6 @@ ...@@ -818,19 +831,6 @@
818 <FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" /> 831 <FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" />
819 <BlendFunc Src="1" Dst="771" /> 832 <BlendFunc Src="1" Dst="771" />
820 </AbstractNodeData> 833 </AbstractNodeData>
821 <AbstractNodeData Name="panel_decorate_pet" Visible="False" ActionTag="-963401781" Tag="404" IconVisible="False" LeftMargin="-0.4424" RightMargin="0.4424" TopMargin="-0.0528" BottomMargin="0.0528" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
822 <Size X="1280.0000" Y="720.0000" />
823 <AnchorPoint />
824 <Position X="-0.4424" Y="0.0528" />
825 <Scale ScaleX="1.0000" ScaleY="1.0000" />
826 <CColor A="255" R="255" G="255" B="255" />
827 <PrePosition X="-0.0003" Y="0.0001" />
828 <PreSize X="1.0000" Y="1.0000" />
829 <SingleColor A="255" R="150" G="200" B="255" />
830 <FirstColor A="255" R="150" G="200" B="255" />
831 <EndColor A="255" R="255" G="255" B="255" />
832 <ColorVector ScaleY="1.0000" />
833 </AbstractNodeData>
834 </Children> 834 </Children>
835 </ObjectData> 835 </ObjectData>
836 </Content> 836 </Content>
......
...@@ -833,7 +833,9 @@ ...@@ -833,7 +833,9 @@
833 <Image Name="achievement_yilingqu.png" /> 833 <Image Name="achievement_yilingqu.png" />
834 <Image Name="act_vip_flag.png" /> 834 <Image Name="act_vip_flag.png" />
835 <Image Name="activity_flag_limit.png" /> 835 <Image Name="activity_flag_limit.png" />
836 <Image Name="activity_gift_icon.png" />
836 <Image Name="activity_lottery_select.png" /> 837 <Image Name="activity_lottery_select.png" />
838 <Image Name="activity_renew.png" />
837 <Image Name="activity_tab_mask.png" /> 839 <Image Name="activity_tab_mask.png" />
838 <Project Name="ActivityGameLotteryItem.csd" Type="Layer" /> 840 <Project Name="ActivityGameLotteryItem.csd" Type="Layer" />
839 <Project Name="ActivityGameLotteryLayer.csd" Type="Layer" /> 841 <Project Name="ActivityGameLotteryLayer.csd" Type="Layer" />
......
...@@ -28,5 +28,14 @@ ...@@ -28,5 +28,14 @@
28 <LastRunType Value="Windows" /> 28 <LastRunType Value="Windows" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/Activity/ActivityVip.csd" />
35 <FilePathData Path="ui/MainScene.csd" />
36 </OpenedDocuments>
37 <ActiveDocument Path="ui/Activity/ActivityVip.csd" />
38 </Value>
39 </Item>
31 </Properties> 40 </Properties>
32 </UserData> 41 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......