Commit 6edf5f05 6edf5f057bdf4ec0fc76495a09568e318676e469 by jinwawa

0529_

1 parent e835002c
Showing 137 changed files with 614 additions and 151 deletions
This diff could not be displayed because it is too large.
...@@ -290,4 +290,81 @@ ...@@ -290,4 +290,81 @@
290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/> 290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/> 291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
292 </data> 292 </data>
293 <data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
294 <!--10.21-10.27 奔跑吧兔子-->
295 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
296 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
297 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
298 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
299 </data>
300 <data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
301 <!--10.28-11.3 接糖果-->
302 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
303 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
304 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
305 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
306 </data>
307 <data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
308 <!--11.4-11.10 飞檐走壁-->
309 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
310 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
311 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
312 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
313 </data>
314 <data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
315 <!--11.11-11.17 旋转海盗-->
316 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
317 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
318 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
319 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
320 </data>
321 <data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
322 <!--11.18-11.24 奔跑吧兔子-->
323 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
324 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
325 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
326 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
327 </data>
328 <data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
329 <!--11.25-12.1 接糖果-->
330 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
331 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
332 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
333 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
334 </data>
335 <data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
336 <!--12.2-12.8 飞檐走壁-->
337 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
338 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
339 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
340 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
341 </data>
342 <data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
343 <!--12.9-12.15 旋转海盗-->
344 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
345 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
346 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
347 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
348 </data>
349 <data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
350 <!--12.16-12.22 奔跑吧兔子-->
351 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
352 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
353 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
354 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
355 </data>
356 <data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
357 <!--12.23-12.29 接糖果-->
358 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
359 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
360 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
361 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
362 </data>
363 <data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
364 <!--12.30-1.5 飞檐走壁-->
365 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
366 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
367 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
368 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
369 </data>
293 </root> 370 </root>
......
This diff could not be displayed because it is too large.
...@@ -290,4 +290,81 @@ ...@@ -290,4 +290,81 @@
290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/> 290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/> 291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
292 </data> 292 </data>
293 <data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
294 <!--10.21-10.27 奔跑吧兔子-->
295 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
296 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
297 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
298 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
299 </data>
300 <data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
301 <!--10.28-11.3 接糖果-->
302 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
303 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
304 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
305 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
306 </data>
307 <data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
308 <!--11.4-11.10 飞檐走壁-->
309 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
310 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
311 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
312 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
313 </data>
314 <data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
315 <!--11.11-11.17 旋转海盗-->
316 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
317 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
318 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
319 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
320 </data>
321 <data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
322 <!--11.18-11.24 奔跑吧兔子-->
323 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
324 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
325 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
326 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
327 </data>
328 <data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
329 <!--11.25-12.1 接糖果-->
330 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
331 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
332 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
333 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
334 </data>
335 <data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
336 <!--12.2-12.8 飞檐走壁-->
337 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
338 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
339 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
340 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
341 </data>
342 <data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
343 <!--12.9-12.15 旋转海盗-->
344 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
345 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
346 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
347 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
348 </data>
349 <data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
350 <!--12.16-12.22 奔跑吧兔子-->
351 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
352 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
353 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
354 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
355 </data>
356 <data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
357 <!--12.23-12.29 接糖果-->
358 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
359 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
360 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
361 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
362 </data>
363 <data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
364 <!--12.30-1.5 飞檐走壁-->
365 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
366 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
367 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
368 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
369 </data>
293 </root> 370 </root>
......
This diff could not be displayed because it is too large.
...@@ -290,4 +290,81 @@ ...@@ -290,4 +290,81 @@
290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/> 290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/> 291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
292 </data> 292 </data>
293 <data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
294 <!--10.21-10.27 奔跑吧兔子-->
295 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
296 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
297 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
298 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
299 </data>
300 <data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
301 <!--10.28-11.3 接糖果-->
302 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
303 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
304 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
305 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
306 </data>
307 <data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
308 <!--11.4-11.10 飞檐走壁-->
309 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
310 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
311 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
312 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
313 </data>
314 <data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
315 <!--11.11-11.17 旋转海盗-->
316 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
317 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
318 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
319 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
320 </data>
321 <data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
322 <!--11.18-11.24 奔跑吧兔子-->
323 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
324 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
325 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
326 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
327 </data>
328 <data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
329 <!--11.25-12.1 接糖果-->
330 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
331 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
332 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
333 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
334 </data>
335 <data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
336 <!--12.2-12.8 飞檐走壁-->
337 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
338 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
339 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
340 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
341 </data>
342 <data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
343 <!--12.9-12.15 旋转海盗-->
344 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
345 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
346 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
347 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
348 </data>
349 <data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
350 <!--12.16-12.22 奔跑吧兔子-->
351 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
352 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
353 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
354 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
355 </data>
356 <data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
357 <!--12.23-12.29 接糖果-->
358 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
359 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
360 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
361 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
362 </data>
363 <data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
364 <!--12.30-1.5 飞檐走壁-->
365 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
366 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
367 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
368 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
369 </data>
293 </root> 370 </root>
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <userDefaultRoot> 2 <userDefaultRoot>
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <Account>m0800279afc6d</Account> 4 <!--m0800278b87c2-->
5 <Account>m0800279afc6c</Account>
5 <exp>0</exp> 6 <exp>0</exp>
6 <versionnum>201801291657</versionnum> 7 <versionnum>201801291657</versionnum>
7 <isMusic>0</isMusic> 8 <isMusic>0</isMusic>
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
24 <new_guide_step>4</new_guide_step> 25 <new_guide_step>4</new_guide_step>
25 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 26 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
26 <feiyanzoubi_best>376</feiyanzoubi_best> 27 <feiyanzoubi_best>376</feiyanzoubi_best>
27 <uid>1030100010142889</uid> 28 <uid>1030100010142914</uid>
28 <is_bird_game_guide>1</is_bird_game_guide> 29 <is_bird_game_guide>1</is_bird_game_guide>
29 <bird_best>1008</bird_best> 30 <bird_best>1008</bird_best>
30 <is_haidao_game_guide>1</is_haidao_game_guide> 31 <is_haidao_game_guide>1</is_haidao_game_guide>
......

245 KB | W: | H:

246 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

44.3 KB | W: | H:

40.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
This diff could not be displayed because it is too large.
...@@ -290,4 +290,81 @@ ...@@ -290,4 +290,81 @@
290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/> 290 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/> 291 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
292 </data> 292 </data>
293 <data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
294 <!--10.21-10.27 奔跑吧兔子-->
295 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
296 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
297 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
298 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
299 </data>
300 <data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
301 <!--10.28-11.3 接糖果-->
302 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
303 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
304 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
305 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
306 </data>
307 <data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
308 <!--11.4-11.10 飞檐走壁-->
309 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
310 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
311 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
312 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
313 </data>
314 <data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
315 <!--11.11-11.17 旋转海盗-->
316 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
317 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
318 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
319 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
320 </data>
321 <data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
322 <!--11.18-11.24 奔跑吧兔子-->
323 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
324 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
325 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
326 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
327 </data>
328 <data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
329 <!--11.25-12.1 接糖果-->
330 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
331 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
332 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
333 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
334 </data>
335 <data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
336 <!--12.2-12.8 飞檐走壁-->
337 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
338 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
339 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
340 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
341 </data>
342 <data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
343 <!--12.9-12.15 旋转海盗-->
344 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
345 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
346 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
347 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
348 </data>
349 <data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
350 <!--12.16-12.22 奔跑吧兔子-->
351 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
352 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
353 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
354 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
355 </data>
356 <data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
357 <!--12.23-12.29 接糖果-->
358 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
359 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
360 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
361 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
362 </data>
363 <data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
364 <!--12.30-1.5 飞檐走壁-->
365 <reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
366 <reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
367 <reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
368 <reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
369 </data>
293 </root> 370 </root>
......

3.35 KB | W: | H:

5.86 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.36 KB | W: | H:

7.78 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.24 KB | W: | H:

7.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.18 KB | W: | H:

5.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.23 KB | W: | H:

5.66 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.08 KB | W: | H:

6.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.33 KB | W: | H:

10.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.1 KB | W: | H:

7.09 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.33 KB | W: | H:

5.74 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.06 KB | W: | H:

4.74 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.74 KB | W: | H:

6.77 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.53 KB | W: | H:

8.22 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.68 KB | W: | H:

8.01 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.16 KB | W: | H:

7.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.69 KB | W: | H:

5.65 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.19 KB | W: | H:

9.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.29 KB | W: | H:

5.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.71 KB | W: | H:

4.73 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.41 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.33 KB | W: | H:

7.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.61 KB | W: | H:

5.92 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.73 KB | W: | H:

6.55 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.72 KB | W: | H:

5.83 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.55 KB | W: | H:

5.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.99 KB | W: | H:

5.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.11 KB | W: | H:

6.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.36 KB | W: | H:

7.75 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.54 KB | W: | H:

5.45 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.27 KB | W: | H:

5.42 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.41 KB | W: | H:

9.06 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.31 KB | W: | H:

5.59 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.18 KB | W: | H:

5.26 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.09 KB | W: | H:

5.26 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.34 KB | W: | H:

8.72 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.6 KB | W: | H:

5.91 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.18 KB | W: | H:

5.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.81 KB | W: | H:

5.91 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.45 KB | W: | H:

6.25 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.58 KB | W: | H:

6.13 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.67 KB | W: | H:

4.38 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.16 KB | W: | H:

3.44 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.38 KB | W: | H:

8.63 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.42 KB | W: | H:

5.65 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.29 KB | W: | H:

3.61 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.53 KB | W: | H:

8.69 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.23 KB | W: | H:

7.32 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.91 KB | W: | H:

4.67 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.23 KB | W: | H:

5.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.3 KB | W: | H:

5.37 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.04 KB | W: | H:

6.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.69 KB | W: | H:

7.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.03 KB | W: | H:

5.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.12 KB | W: | H:

4.75 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.74 KB | W: | H:

6.31 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.62 KB | W: | H:

7.33 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.13 KB | W: | H:

8.28 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.34 KB | W: | H:

7.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.86 KB | W: | H:

6.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.07 KB | W: | H:

6.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.01 KB | W: | H:

8.61 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.3 KB | W: | H:

8.84 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.55 KB | W: | H:

6.11 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.88 KB | W: | H:

6.95 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.72 KB | W: | H:

4.49 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.1 KB | W: | H:

5.41 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.72 KB | W: | H:

5.96 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3 KB | W: | H:

4.99 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.4 KB | W: | H:

4.22 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.43 KB | W: | H:

6.32 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.74 KB | W: | H:

8.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.53 KB | W: | H:

9.48 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.38 KB | W: | H:

5.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.53 KB | W: | H:

5.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.89 KB | W: | H:

4.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.06 KB | W: | H:

6.15 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.56 KB | W: | H:

7.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.87 KB | W: | H:

9.59 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.88 KB | W: | H:

4.64 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.97 KB | W: | H:

6.58 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.72 KB | W: | H:

4.69 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.03 KB | W: | H:

5.22 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.15 KB | W: | H:

5.38 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.17 KB | W: | H:

6.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.83 KB | W: | H:

9.35 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -572,7 +572,7 @@ function UserModel.onLoginSuccessFun(params) ...@@ -572,7 +572,7 @@ function UserModel.onLoginSuccessFun(params)
572 -- UserModel.pets[10002] = {id=10002,val=1,exp=105,cnt=9}; 572 -- UserModel.pets[10002] = {id=10002,val=1,exp=105,cnt=9};
573 -- UserModel.pets[10003] = {id=10003,val=1,exp=105,cnt=16}; 573 -- UserModel.pets[10003] = {id=10003,val=1,exp=105,cnt=16};
574 574
575 UserModel.pet_id = {}; 575 UserModel.pet_id = {}; --房间中的宠物,key:idx位置序号, val1:pet_id宠物id
576 for i,v in ipairs(params.data.pet_id) do 576 for i,v in ipairs(params.data.pet_id) do
577 UserModel.pet_id[#UserModel.pet_id+1] = {id=v.val1,idx=v.key}; 577 UserModel.pet_id[#UserModel.pet_id+1] = {id=v.val1,idx=v.key};
578 end 578 end
...@@ -912,6 +912,10 @@ function UserModel.getLeftVipDay() ...@@ -912,6 +912,10 @@ function UserModel.getLeftVipDay()
912 end 912 end
913 end 913 end
914 914
915 if NEED_PAY==0 then --大唐版本所有的用户都是VIP
916 left_day_num=100;
917 end
918
915 return left_day_num; 919 return left_day_num;
916 end 920 end
917 921
...@@ -1068,6 +1072,7 @@ function UserModel.remove_home_pet(id) ...@@ -1068,6 +1072,7 @@ function UserModel.remove_home_pet(id)
1068 end 1072 end
1069 end 1073 end
1070 1074
1075 --筛选还有放宠物空位置
1071 function UserModel.get_empty_pet_pos() 1076 function UserModel.get_empty_pet_pos()
1072 local idx = 0; 1077 local idx = 0;
1073 for i=1,5 do 1078 for i=1,5 do
......
...@@ -17,6 +17,7 @@ isUpdateInit = false; ...@@ -17,6 +17,7 @@ isUpdateInit = false;
17 17
18 function LoadingScene:ctor(params) 18 function LoadingScene:ctor(params)
19 print("loading scene params:",params); 19 print("loading scene params:",params);
20
20 if params then 21 if params then
21 self.nextSceneName = params.nextSceneName; 22 self.nextSceneName = params.nextSceneName;
22 self.nextParams = params; 23 self.nextParams = params;
......
...@@ -5,11 +5,11 @@ require("app.views.view.HeadImageSprite"); ...@@ -5,11 +5,11 @@ require("app.views.view.HeadImageSprite");
5 MainScene.gm_id = 100001; 5 MainScene.gm_id = 100001;
6 6
7 local pets_pos_list = { }; 7 local pets_pos_list = { };
8 pets_pos_list[#pets_pos_list + 1] = { x = 288, y = 82 }; 8 pets_pos_list[#pets_pos_list + 1] = { x = 100, y = 82 };
9 pets_pos_list[#pets_pos_list + 1] = { x = 495, y = 167 }; 9 pets_pos_list[#pets_pos_list + 1] = { x = 371, y = 12 };
10 pets_pos_list[#pets_pos_list + 1] = { x = 635, y = 52 }; 10 pets_pos_list[#pets_pos_list + 1] = { x = 600, y = 62 };
11 pets_pos_list[#pets_pos_list + 1] = { x = 806, y = 172 }; 11 pets_pos_list[#pets_pos_list + 1] = { x = 800, y = 45 };
12 pets_pos_list[#pets_pos_list + 1] = { x = 1153, y = 76 }; 12 pets_pos_list[#pets_pos_list + 1] = { x = 1030, y = 76 };
13 13
14 function MainScene:ctor(params) 14 function MainScene:ctor(params)
15 GAME_ID = 0; 15 GAME_ID = 0;
...@@ -19,6 +19,7 @@ function MainScene:ctor(params) ...@@ -19,6 +19,7 @@ function MainScene:ctor(params)
19 end 19 end
20 20
21 function MainScene:onCreate(params) 21 function MainScene:onCreate(params)
22 logD("enter MainScene----------------------------->");
22 self.keypadManager = KeypadManager:create(self); 23 self.keypadManager = KeypadManager:create(self);
23 24
24 self.ui = cc.CSLoader:createNode("ui/MainScene.csb"); 25 self.ui = cc.CSLoader:createNode("ui/MainScene.csb");
...@@ -41,6 +42,7 @@ function MainScene:onCreate(params) ...@@ -41,6 +42,7 @@ function MainScene:onCreate(params)
41 42
42 self.wall = self.ui:getChildByName("wall"); 43 self.wall = self.ui:getChildByName("wall");
43 self.panel_decorate = self.ui:getChildByName("panel_decorate"); 44 self.panel_decorate = self.ui:getChildByName("panel_decorate");
45 self.panel_decorate_pet = self.ui:getChildByName("panel_decorate_pet");
44 self.mask_area_1 = self.ui:getChildByName("mask_area_1"); 46 self.mask_area_1 = self.ui:getChildByName("mask_area_1");
45 self.mask_area_2 = self.ui:getChildByName("mask_area_2"); 47 self.mask_area_2 = self.ui:getChildByName("mask_area_2");
46 self.mask_area_1:setVisible(false); 48 self.mask_area_1:setVisible(false);
...@@ -168,6 +170,7 @@ function MainScene:onCreate(params) ...@@ -168,6 +170,7 @@ function MainScene:onCreate(params)
168 SoundManager.playMusic("res/sound/bg_music_hall.mp3"); 170 SoundManager.playMusic("res/sound/bg_music_hall.mp3");
169 171
170 self.panel_decorate:removeAllChildren(); 172 self.panel_decorate:removeAllChildren();
173 self.panel_decorate_pet:removeAllChildren();
171 self:showPets(); 174 self:showPets();
172 self:showHallDecorate(); 175 self:showHallDecorate();
173 self:update_role_show(); 176 self:update_role_show();
...@@ -230,6 +233,7 @@ function MainScene:onLoginSuccess(params) ...@@ -230,6 +233,7 @@ function MainScene:onLoginSuccess(params)
230 SoundManager.playMusic("res/sound/bg_music_hall.mp3"); 233 SoundManager.playMusic("res/sound/bg_music_hall.mp3");
231 234
232 self.panel_decorate:removeAllChildren(); 235 self.panel_decorate:removeAllChildren();
236 self.panel_decorate_pet:removeAllChildren();
233 self:showPets(); 237 self:showPets();
234 self:showHallDecorate(); 238 self:showHallDecorate();
235 self:update_role_show(); 239 self:update_role_show();
...@@ -461,18 +465,20 @@ function MainScene:showPets() ...@@ -461,18 +465,20 @@ function MainScene:showPets()
461 end 465 end
462 466
463 function MainScene:addPet(id, idx) 467 function MainScene:addPet(id, idx)
468 local pet_info = PetInfo.get_pet_info(id);
464 local sp = cc.Sprite:create("res/pet/icon/" .. id .. ".png"); 469 local sp = cc.Sprite:create("res/pet/icon/" .. id .. ".png");
465 sp:setName("pet_" .. id); 470 sp:setName("pet_" .. id);
466 sp:setAnchorPoint(cc.p(0.5, 0)); 471 sp:setAnchorPoint(cc.p(0.5, 0));
467 sp:setPosition(pets_pos_list[idx]); 472 sp:setPosition(pets_pos_list[idx]);
473 sp:setScale(pet_info.scale);
468 474
469 self.panel_decorate:addChild(sp); 475 self.panel_decorate_pet:addChild(sp);
470 476
471 print("------------------- add pet:", id, idx); 477 print("------------------- add pet:", id, idx);
472 end 478 end
473 479
474 function MainScene:removePet(id) 480 function MainScene:removePet(id)
475 local sp = self.panel_decorate:getChildByName("pet_" .. id); 481 local sp = self.panel_decorate_pet:getChildByName("pet_" .. id);
476 if sp then 482 if sp then
477 sp:removeSelf(); 483 sp:removeSelf();
478 end 484 end
...@@ -654,6 +660,11 @@ function MainScene:onFriendClick() ...@@ -654,6 +660,11 @@ function MainScene:onFriendClick()
654 cmsg.on("gateway_msg.get_peer_user_home_msg_res", self.handlerUserHomeInfoResFun); 660 cmsg.on("gateway_msg.get_peer_user_home_msg_res", self.handlerUserHomeInfoResFun);
655 SocketClient:getInstance():send("gateway_msg.get_peer_user_home_msg", { uid = UserModel.user_info.uid }); 661 SocketClient:getInstance():send("gateway_msg.get_peer_user_home_msg", { uid = UserModel.user_info.uid });
656 end 662 end
663
664 --装饰界面需要隐藏游乐场、宠物pk、抓宠物
665 self.btn_ylc:setVisible(false);
666 self.btn_cwy:setVisible(false);
667 self.btn_grasp:setVisible(false);
657 end 668 end
658 669
659 function MainScene:onUserHomeInfoResFun(params) 670 function MainScene:onUserHomeInfoResFun(params)
...@@ -672,6 +683,12 @@ function MainScene:onDecorateClick() ...@@ -672,6 +683,12 @@ function MainScene:onDecorateClick()
672 Alert.showOne(strings.msg_1002); 683 Alert.showOne(strings.msg_1002);
673 return; 684 return;
674 end 685 end
686
687 --装饰界面需要隐藏游乐场、宠物pk、抓宠物
688 self.btn_ylc:setVisible(false);
689 self.btn_cwy:setVisible(false);
690 self.btn_grasp:setVisible(false);
691
675 local reciever = require("app.views.view.DecorateView"):show(); 692 local reciever = require("app.views.view.DecorateView"):show();
676 self.keypadManager:addKeypadReceiver(reciever); 693 self.keypadManager:addKeypadReceiver(reciever);
677 end 694 end
......
1 local OtherHomeScene = class("OtherHomeScene", import(".BaseSceneNew")); 1 local OtherHomeScene = class("OtherHomeScene", import(".BaseSceneNew"));
2 2
3 local pets_pos_list = {}; 3 local pets_pos_list = { };
4 pets_pos_list[#pets_pos_list+1] = {x=288,y=82}; 4 pets_pos_list[#pets_pos_list + 1] = { x = 100, y = 82 };
5 pets_pos_list[#pets_pos_list+1] = {x=495,y=167}; 5 pets_pos_list[#pets_pos_list + 1] = { x = 371, y = 12 };
6 pets_pos_list[#pets_pos_list+1] = {x=635,y=52}; 6 pets_pos_list[#pets_pos_list + 1] = { x = 600, y = 62 };
7 pets_pos_list[#pets_pos_list+1] = {x=806,y=172}; 7 pets_pos_list[#pets_pos_list + 1] = { x = 800, y = 45 };
8 pets_pos_list[#pets_pos_list+1] = {x=1153,y=76}; 8 pets_pos_list[#pets_pos_list + 1] = { x = 1100, y = 76 };
9 9
10 function OtherHomeScene:ctor(params) 10 function OtherHomeScene:ctor(params)
11 OtherHomeScene.super.ctor(self); 11 OtherHomeScene.super.ctor(self);
...@@ -41,6 +41,8 @@ function OtherHomeScene:onCreate(params) ...@@ -41,6 +41,8 @@ function OtherHomeScene:onCreate(params)
41 self.btn_ylc:setVisible(false); 41 self.btn_ylc:setVisible(false);
42 self.btn_cwy = self.ui:getChildByName("btn_pet_pk"); 42 self.btn_cwy = self.ui:getChildByName("btn_pet_pk");
43 self.btn_cwy:setVisible(false); 43 self.btn_cwy:setVisible(false);
44 self.btn_grasp = self.ui:getChildByName("btn_pet_grasp");
45 self.btn_grasp:setVisible(false);
44 self.btn_activity = self.ui:getChildByName("panel_top"):getChildByName("btn_activity"); 46 self.btn_activity = self.ui:getChildByName("panel_top"):getChildByName("btn_activity");
45 self.btn_activity:setVisible(false); 47 self.btn_activity:setVisible(false);
46 self.btn_task = self.ui:getChildByName("panel_top"):getChildByName("btn_task"); 48 self.btn_task = self.ui:getChildByName("panel_top"):getChildByName("btn_task");
......
...@@ -23,7 +23,8 @@ function PetPkScene:onCreate(params) ...@@ -23,7 +23,8 @@ function PetPkScene:onCreate(params)
23 self.win_uid = params.btl.win_uid; 23 self.win_uid = params.btl.win_uid;
24 self.add_money = params.add_money; 24 self.add_money = params.add_money;
25 self.change_score = params.change_score; 25 self.change_score = params.change_score;
26 print("宠物战斗增加金币:"..self.add_money,"积分:"..self.change_score); 26 self.add_exp = params.add_exp;
27 print("宠物战斗增加金币:"..self.add_money,"积分:"..self.change_score,"经验:"..self.add_exp);
27 UserModel.user_info.pk_val=UserModel.user_info.pk_val+self.change_score; 28 UserModel.user_info.pk_val=UserModel.user_info.pk_val+self.change_score;
28 29
29 self.ui = cc.CSLoader:createNode("ui/pet/PetPkScene.csb"); 30 self.ui = cc.CSLoader:createNode("ui/pet/PetPkScene.csb");
...@@ -131,7 +132,7 @@ function PetPkScene:show_round() ...@@ -131,7 +132,7 @@ function PetPkScene:show_round()
131 self:show_round_buff(btl_round_data); 132 self:show_round_buff(btl_round_data);
132 else 133 else
133 print("show round over! winner :",UserModel.changeUidToString(self.win_uid)); 134 print("show round over! winner :",UserModel.changeUidToString(self.win_uid));
134 local reciever = require("app.views.view.PetPkResultView"):show({win_uid=self.win_uid,add_money=self.add_money,change_score=self.change_score,},handler(self,self.onPetPkExit),handler(self,self.onPetPkAgain)); 135 local reciever = require("app.views.view.PetPkResultView"):show({win_uid=self.win_uid,add_money=self.add_money,change_score=self.change_score,add_exp=self.add_exp},handler(self,self.onPetPkExit),handler(self,self.onPetPkAgain));
135 self.keypadManager:addKeypadReceiver(reciever); 136 self.keypadManager:addKeypadReceiver(reciever);
136 end 137 end
137 end 138 end
...@@ -223,7 +224,7 @@ function PetPkScene:show_table_pet_item(_parent,team_list,vv) ...@@ -223,7 +224,7 @@ function PetPkScene:show_table_pet_item(_parent,team_list,vv)
223 if cc.FileUtils:getInstance():isFileExist(icon_url) then 224 if cc.FileUtils:getInstance():isFileExist(icon_url) then
224 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 225 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
225 end 226 end
226 item:getChildByName("icon"):setScale(pet_info.scale); 227 --item:getChildByName("icon"):setScale(pet_info.scale); --不再需要放大或缩小
227 icon_url = "res/pet/attr_"..pet_info.attr..".png"; 228 icon_url = "res/pet/attr_"..pet_info.attr..".png";
228 if cc.FileUtils:getInstance():isFileExist(icon_url) then 229 if cc.FileUtils:getInstance():isFileExist(icon_url) then
229 item:getChildByName("attr"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 230 item:getChildByName("attr"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
...@@ -909,7 +910,7 @@ function PetPkScene:onNotifyGameEndCallBackFun(params) ...@@ -909,7 +910,7 @@ function PetPkScene:onNotifyGameEndCallBackFun(params)
909 cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun); 910 cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
910 911
911 local btl = params.data.btl; 912 local btl = params.data.btl;
912 app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score}); 913 app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score,add_exp=params.data.add_exp});
913 end 914 end
914 915
915 --返回键处理函数 916 --返回键处理函数
......
...@@ -24,6 +24,7 @@ function DecorateView:show() ...@@ -24,6 +24,7 @@ function DecorateView:show()
24 end 24 end
25 25
26 function DecorateView:init() 26 function DecorateView:init()
27
27 self.panel = self:getChildByName("panel"); 28 self.panel = self:getChildByName("panel");
28 self.btn_back = self.panel:getChildByName("btn_back"); 29 self.btn_back = self.panel:getChildByName("btn_back");
29 self.btn_back.fn = handler(self,self.onClose); 30 self.btn_back.fn = handler(self,self.onClose);
...@@ -405,6 +406,11 @@ function DecorateView:onClose() ...@@ -405,6 +406,11 @@ function DecorateView:onClose()
405 self.runningScene.mask_area_2:setVisible(false); 406 self.runningScene.mask_area_2:setVisible(false);
406 self.runningScene:showAllDecorate(); 407 self.runningScene:showAllDecorate();
407 self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame()); 408 self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame());
409
410 --返回的时候将游乐场等图标显示出来
411 self.runningScene.btn_ylc:setVisible(true);
412 self.runningScene.btn_cwy:setVisible(true);
413 self.runningScene.btn_grasp:setVisible(true);
408 self:close(); 414 self:close();
409 end 415 end
410 416
...@@ -416,6 +422,11 @@ function DecorateView:onKeypadBack() ...@@ -416,6 +422,11 @@ function DecorateView:onKeypadBack()
416 self.runningScene.mask_area_2:setVisible(false); 422 self.runningScene.mask_area_2:setVisible(false);
417 self.runningScene:showAllDecorate(); 423 self.runningScene:showAllDecorate();
418 self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame()); 424 self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame());
425
426 --返回的时候将游乐场等图标显示出来
427 self.runningScene.btn_ylc:setVisible(true);
428 self.runningScene.btn_cwy:setVisible(true);
429 self.runningScene.btn_grasp:setVisible(true);
419 self:close(); 430 self:close();
420 end 431 end
421 432
......
...@@ -2,6 +2,8 @@ local FriendView = dialog.uinode("ui/friend/FriendLayer.csb",import(".BaseViewNe ...@@ -2,6 +2,8 @@ local FriendView = dialog.uinode("ui/friend/FriendLayer.csb",import(".BaseViewNe
2 2
3 function FriendView:ctor() 3 function FriendView:ctor()
4 FriendView.super.ctor(self); 4 FriendView.super.ctor(self);
5
6
5 end 7 end
6 8
7 function FriendView:show(uid,user_home) 9 function FriendView:show(uid,user_home)
...@@ -30,6 +32,13 @@ function FriendView:init() ...@@ -30,6 +32,13 @@ function FriendView:init()
30 -- SoundManager.playEffect("res/sound/v9shangdianlimai.mp3"); 32 -- SoundManager.playEffect("res/sound/v9shangdianlimai.mp3");
31 33
32 self.runningScene = cc.Director:getInstance():getRunningScene(); 34 self.runningScene = cc.Director:getInstance():getRunningScene();
35
36 if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
37 self.runningScene.btn_ylc:setVisible(false);
38 self.runningScene.btn_cwy:setVisible(false);
39 self.runningScene.btn_grasp:setVisible(false);
40 end
41
33 self.scrollView = self.panel:getChildByName("ScrollView"); 42 self.scrollView = self.panel:getChildByName("ScrollView");
34 43
35 self.btn_pre = self.panel:getChildByName("btn_pre"); 44 self.btn_pre = self.panel:getChildByName("btn_pre");
...@@ -69,7 +78,7 @@ function FriendView:init() ...@@ -69,7 +78,7 @@ function FriendView:init()
69 --self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家"); 78 --self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家");
70 self.btn_back:loadTextureNormal("res/ui/friend/bg_friend_back.png"); 79 self.btn_back:loadTextureNormal("res/ui/friend/bg_friend_back.png");
71 self.btn_back:loadTexturePressed("res/ui/dress/bg_friend_back.png"); 80 self.btn_back:loadTexturePressed("res/ui/dress/bg_friend_back.png");
72 self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame()); 81 --self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame());
73 82
74 table.sort(game_score,function (aa,bb) 83 table.sort(game_score,function (aa,bb)
75 return aa.val1 > bb.val1; 84 return aa.val1 > bb.val1;
...@@ -535,8 +544,18 @@ function FriendView:onGoHome() ...@@ -535,8 +544,18 @@ function FriendView:onGoHome()
535 544
536 if self.uid ~= UserModel.user_info.uid then 545 if self.uid ~= UserModel.user_info.uid then
537 app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.FriendView",user_home=self.user_home}); 546 app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.FriendView",user_home=self.user_home});
547 else
548 logD("退出朋友界面--------------------------》");
549 --返回的时候将游乐场等图标显示出来
550 if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
551 self.runningScene.btn_ylc:setVisible(true);
552 self.runningScene.btn_cwy:setVisible(true);
553 self.runningScene.btn_grasp:setVisible(true);
554 end
538 end 555 end
539 556
557
558
540 self:close(); 559 self:close();
541 end 560 end
542 561
...@@ -547,8 +566,17 @@ function FriendView:onKeypadBack() ...@@ -547,8 +566,17 @@ function FriendView:onKeypadBack()
547 566
548 if self.uid ~= UserModel.user_info.uid then 567 if self.uid ~= UserModel.user_info.uid then
549 app:enterScene("LoadingScene",{nextSceneName="MainScene"}); 568 app:enterScene("LoadingScene",{nextSceneName="MainScene"});
569 else
570 --返回的时候将游乐场等图标显示出来
571 if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
572 self.runningScene.btn_ylc:setVisible(true);
573 self.runningScene.btn_cwy:setVisible(true);
574 self.runningScene.btn_grasp:setVisible(true);
575 end
576
550 end 577 end
551 578
579
552 self:close(); 580 self:close();
553 end 581 end
554 582
......
...@@ -185,7 +185,7 @@ function PetFightView:onNotifyGameEndCallBackFun(params) ...@@ -185,7 +185,7 @@ function PetFightView:onNotifyGameEndCallBackFun(params)
185 cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun); 185 cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
186 186
187 local btl = params.data.btl; 187 local btl = params.data.btl;
188 app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score}); 188 app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score,add_exp=params.data.add_exp});
189 end 189 end
190 190
191 function PetFightView:onTeamClick() 191 function PetFightView:onTeamClick()
......
...@@ -12,6 +12,7 @@ function PetPkResultView:show(data,exitFun,againFun) ...@@ -12,6 +12,7 @@ function PetPkResultView:show(data,exitFun,againFun)
12 local win_uid = data.win_uid; 12 local win_uid = data.win_uid;
13 local add_money = data.add_money; 13 local add_money = data.add_money;
14 local change_score = data.change_score; 14 local change_score = data.change_score;
15 local add_exp=data.add_exp;
15 16
16 local panel = inst:getChildByName("panel"); 17 local panel = inst:getChildByName("panel");
17 panel:setScale(0.5); 18 panel:setScale(0.5);
...@@ -30,14 +31,15 @@ function PetPkResultView:show(data,exitFun,againFun) ...@@ -30,14 +31,15 @@ function PetPkResultView:show(data,exitFun,againFun)
30 inst:getChildByName("panel"):getChildByName("pet_pk_title_win"):setVisible(false); 31 inst:getChildByName("panel"):getChildByName("pet_pk_title_win"):setVisible(false);
31 end 32 end
32 33
33 inst:showItems(add_money,change_score); 34 inst:showItems(add_money,change_score,add_exp);
34 35
35 inst:init(); 36 inst:init();
36 37
37 return inst; 38 return inst;
38 end 39 end
39 40
40 function PetPkResultView:showItems(add_money,change_score) 41 function PetPkResultView:showItems(add_money,change_score,add_exp)
42 logD("pk战斗得了经验----------------------->"..add_exp);
41 local items = {}; 43 local items = {};
42 if add_money > 0 then 44 if add_money > 0 then
43 items[#items+1] = {id=100001,cnt=add_money}; 45 items[#items+1] = {id=100001,cnt=add_money};
...@@ -45,6 +47,9 @@ function PetPkResultView:showItems(add_money,change_score) ...@@ -45,6 +47,9 @@ function PetPkResultView:showItems(add_money,change_score)
45 if change_score ~= 0 then 47 if change_score ~= 0 then
46 items[#items+1] = {id=110002,cnt=change_score}; 48 items[#items+1] = {id=110002,cnt=change_score};
47 end 49 end
50 if add_exp ~= 0 then
51 items[#items+1] = {id=100002,cnt=add_exp};
52 end
48 53
49 local is_shangxian = false; --今日奖励是否达到上限 54 local is_shangxian = false; --今日奖励是否达到上限
50 if #items > 0 then 55 if #items > 0 then
...@@ -75,6 +80,8 @@ function PetPkResultView:showItems(add_money,change_score) ...@@ -75,6 +80,8 @@ function PetPkResultView:showItems(add_money,change_score)
75 local info = nil; 80 local info = nil;
76 if data.id == 110002 then 81 if data.id == 110002 then
77 info = {id=data.id,name="积分"}; 82 info = {id=data.id,name="积分"};
83 elseif data.id==100002 then
84 info = {id=data.id,name="经验"};
78 else 85 else
79 info = ItemInfo.getItemInfo(data.id); 86 info = ItemInfo.getItemInfo(data.id);
80 end 87 end
...@@ -94,6 +101,13 @@ function PetPkResultView:showItems(add_money,change_score) ...@@ -94,6 +101,13 @@ function PetPkResultView:showItems(add_money,change_score)
94 else 101 else
95 item:getChildByName("vip"):setVisible(false); 102 item:getChildByName("vip"):setVisible(false);
96 end 103 end
104 elseif data.id == 100002 then
105 local left_vip_day = UserModel.getLeftVipDay();
106 if left_vip_day > 0 then
107 item:getChildByName("vip"):setVisible(true);
108 else
109 item:getChildByName("vip"):setVisible(false);
110 end
97 else 111 else
98 item:getChildByName("vip"):setVisible(false); 112 item:getChildByName("vip"):setVisible(false);
99 end 113 end
......
...@@ -101,7 +101,7 @@ function RolePetDetail:init() ...@@ -101,7 +101,7 @@ function RolePetDetail:init()
101 local skill_info = PetInfo.get_skill_info(self.pet_info.skillid); 101 local skill_info = PetInfo.get_skill_info(self.pet_info.skillid);
102 local skill_eff_info = PetInfo.get_skill_eff_info(skill_info.eff); 102 local skill_eff_info = PetInfo.get_skill_eff_info(skill_info.eff);
103 local eff_name = skill_eff_info.name; 103 local eff_name = skill_eff_info.name;
104 --logD("petDetail-------------------------->"..eff_name); 104 logD("petDetail-------------------------->"..eff_name);
105 local xibie = skill_eff_info.xibie; 105 local xibie = skill_eff_info.xibie;
106 local zhuangtai = skill_eff_info.zhuangtai; 106 local zhuangtai = skill_eff_info.zhuangtai;
107 107
...@@ -111,10 +111,13 @@ function RolePetDetail:init() ...@@ -111,10 +111,13 @@ function RolePetDetail:init()
111 eff_name = string.gsub(eff_name,"i","%%s"); --数字 111 eff_name = string.gsub(eff_name,"i","%%s"); --数字
112 eff_name = string.gsub(eff_name,"h","%%s"); --系别 112 eff_name = string.gsub(eff_name,"h","%%s"); --系别
113 eff_name = string.gsub(eff_name,"k","%%s"); --状态 113 eff_name = string.gsub(eff_name,"k","%%s"); --状态
114 --logD("petDetail22222-------------------------->"..eff_name); 114 logD("petDetail22222-------------------------->"..eff_name);
115 local xibieList={"水","火","草"}; 115 local xibieList={"水系","火系","草系",""};
116 local zhuangtaiList={"嘲讽","护罩","缠绕","冻结","锋利","中毒","血牛"}; 116 local zhuangtaiList={"嘲讽","护罩","缠绕","冻结","锋利","中毒","血牛"};
117
118 --self.pet_info.eff_arr pet表中宠物的eff="1,0,1"
117 if xibie~=0 then 119 if xibie~=0 then
120 --logD("petDetail22222-------------------------->"..self.pet_info.eff_arr[tonumber(xibie)]);
118 self.pet_info.eff_arr[tonumber(xibie)] = xibieList[tonumber(self.pet_info.eff_arr[tonumber(xibie)])]; 121 self.pet_info.eff_arr[tonumber(xibie)] = xibieList[tonumber(self.pet_info.eff_arr[tonumber(xibie)])];
119 end 122 end
120 if zhuangtai~=0 then 123 if zhuangtai~=0 then
...@@ -270,7 +273,7 @@ function RolePetDetail:onHome(ref,event) ...@@ -270,7 +273,7 @@ function RolePetDetail:onHome(ref,event)
270 else 273 else
271 local pos = UserModel.get_empty_pet_pos(); 274 local pos = UserModel.get_empty_pet_pos();
272 if pos == 0 then 275 if pos == 0 then
273 Alert.showOne(strings.msg_1030); 276 Alert.showOne(strings.msg_1030); --小屋只能摆放5个宠物,你已经摆满了哦
274 else 277 else
275 LoadingManager.showDataLoading(); 278 LoadingManager.showDataLoading();
276 delayCall(0.3,function() 279 delayCall(0.3,function()
......
...@@ -41,7 +41,7 @@ function SignView:init() ...@@ -41,7 +41,7 @@ function SignView:init()
41 else 41 else
42 local sign_reward_str = SignInfo.getSignInfo().reward; 42 local sign_reward_str = SignInfo.getSignInfo().reward;
43 local sign_reward_arr = StringUtil.split(sign_reward_str,","); 43 local sign_reward_arr = StringUtil.split(sign_reward_str,",");
44 self:getChildByName("panel"):getChildByName("txt_vip"):setString("VIP经验+"..sign_reward_arr[2]); 44 self:getChildByName("panel"):getChildByName("txt_vip"):setString("经验+"..sign_reward_arr[2]);
45 --self:getChildByName("panel"):getChildByName("pic_vip"):setVisible(false); 45 --self:getChildByName("panel"):getChildByName("pic_vip"):setVisible(false);
46 end 46 end
47 47
......
...@@ -77,6 +77,14 @@ function XyxGameOver:onGameEndCallBackFun(params) ...@@ -77,6 +77,14 @@ function XyxGameOver:onGameEndCallBackFun(params)
77 else 77 else
78 item:getChildByName("vip"):setVisible(false); 78 item:getChildByName("vip"):setVisible(false);
79 end 79 end
80 elseif data.id == 100002 then
81 local left_vip_day = UserModel.getLeftVipDay();
82 if left_vip_day > 0 then
83 item:getChildByName("vip2"):setVisible(true);
84 else
85 item:getChildByName("vip2"):setVisible(false);
86 end
87 item:getChildByName("vip"):setVisible(false);
80 else 88 else
81 item:getChildByName("vip"):setVisible(false); 89 item:getChildByName("vip"):setVisible(false);
82 end 90 end
......

245 KB | W: | H:

246 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

44.3 KB | W: | H:

40.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -133,14 +133,14 @@ ...@@ -133,14 +133,14 @@
133 <EndColor A="255" R="255" G="255" B="255" /> 133 <EndColor A="255" R="255" G="255" B="255" />
134 <ColorVector ScaleY="1.0000" /> 134 <ColorVector ScaleY="1.0000" />
135 </AbstractNodeData> 135 </AbstractNodeData>
136 <AbstractNodeData Name="logo_game_3" ActionTag="492850395" Tag="982" IconVisible="False" LeftMargin="300.0822" RightMargin="289.9178" TopMargin="36.8483" BottomMargin="432.1517" ctype="SpriteObjectData"> 136 <AbstractNodeData Name="logo_game_3" ActionTag="492850395" Tag="982" IconVisible="False" LeftMargin="331.4974" RightMargin="326.5026" TopMargin="45.4631" BottomMargin="448.5369" ctype="SpriteObjectData">
137 <Size X="690.0000" Y="251.0000" /> 137 <Size X="622.0000" Y="226.0000" />
138 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 138 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
139 <Position X="645.0822" Y="557.6517" /> 139 <Position X="642.4974" Y="561.5369" />
140 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 140 <Scale ScaleX="1.0000" ScaleY="1.0000" />
141 <CColor A="255" R="255" G="255" B="255" /> 141 <CColor A="255" R="255" G="255" B="255" />
142 <PrePosition X="0.5040" Y="0.7745" /> 142 <PrePosition X="0.5020" Y="0.7799" />
143 <PreSize X="0.5391" Y="0.3486" /> 143 <PreSize X="0.4859" Y="0.3139" />
144 <FileData Type="Normal" Path="common/logo_game.png" Plist="" /> 144 <FileData Type="Normal" Path="common/logo_game.png" Plist="" />
145 <BlendFunc Src="1" Dst="771" /> 145 <BlendFunc Src="1" Dst="771" />
146 </AbstractNodeData> 146 </AbstractNodeData>
......
...@@ -17,19 +17,6 @@ ...@@ -17,19 +17,6 @@
17 <FileData Type="Normal" Path="decorate/700001.png" Plist="" /> 17 <FileData Type="Normal" Path="decorate/700001.png" Plist="" />
18 <BlendFunc Src="770" Dst="771" /> 18 <BlendFunc Src="770" Dst="771" />
19 </AbstractNodeData> 19 </AbstractNodeData>
20 <AbstractNodeData Name="panel_decorate" ActionTag="1079800715" Tag="55" IconVisible="False" LeftMargin="6.0000" RightMargin="-6.0000" TopMargin="-2.0000" BottomMargin="2.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
21 <Size X="1280.0000" Y="720.0000" />
22 <AnchorPoint />
23 <Position X="6.0000" Y="2.0000" />
24 <Scale ScaleX="1.0000" ScaleY="1.0000" />
25 <CColor A="255" R="255" G="255" B="255" />
26 <PrePosition X="0.0047" Y="0.0028" />
27 <PreSize X="1.0000" Y="1.0000" />
28 <SingleColor A="255" R="150" G="200" B="255" />
29 <FirstColor A="255" R="150" G="200" B="255" />
30 <EndColor A="255" R="255" G="255" B="255" />
31 <ColorVector ScaleY="1.0000" />
32 </AbstractNodeData>
33 <AbstractNodeData Name="role" ActionTag="2016536057" Tag="78" IconVisible="True" LeftMargin="1024.3118" RightMargin="28.6882" TopMargin="334.2456" BottomMargin="86.7544" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData"> 20 <AbstractNodeData Name="role" ActionTag="2016536057" Tag="78" IconVisible="True" LeftMargin="1024.3118" RightMargin="28.6882" TopMargin="334.2456" BottomMargin="86.7544" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData">
34 <Size X="227.0000" Y="299.0000" /> 21 <Size X="227.0000" Y="299.0000" />
35 <AnchorPoint /> 22 <AnchorPoint />
...@@ -62,6 +49,19 @@ ...@@ -62,6 +49,19 @@
62 <FileData Type="Normal" Path="ui/decorate/bg_area_2.png" Plist="" /> 49 <FileData Type="Normal" Path="ui/decorate/bg_area_2.png" Plist="" />
63 <BlendFunc Src="1" Dst="771" /> 50 <BlendFunc Src="1" Dst="771" />
64 </AbstractNodeData> 51 </AbstractNodeData>
52 <AbstractNodeData Name="panel_decorate" ActionTag="1079800715" Tag="55" IconVisible="False" LeftMargin="6.0000" RightMargin="-6.0000" TopMargin="-2.0000" BottomMargin="2.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
53 <Size X="1280.0000" Y="720.0000" />
54 <AnchorPoint />
55 <Position X="6.0000" Y="2.0000" />
56 <Scale ScaleX="1.0000" ScaleY="1.0000" />
57 <CColor A="255" R="255" G="255" B="255" />
58 <PrePosition X="0.0047" Y="0.0028" />
59 <PreSize X="1.0000" Y="1.0000" />
60 <SingleColor A="255" R="150" G="200" B="255" />
61 <FirstColor A="255" R="150" G="200" B="255" />
62 <EndColor A="255" R="255" G="255" B="255" />
63 <ColorVector ScaleY="1.0000" />
64 </AbstractNodeData>
65 <AbstractNodeData Name="panel_top" ActionTag="247647262" Tag="42" IconVisible="False" BottomMargin="570.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData"> 65 <AbstractNodeData Name="panel_top" ActionTag="247647262" Tag="42" IconVisible="False" BottomMargin="570.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
66 <Size X="1280.0000" Y="150.0000" /> 66 <Size X="1280.0000" Y="150.0000" />
67 <Children> 67 <Children>
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
549 <EndColor A="255" R="255" G="255" B="255" /> 549 <EndColor A="255" R="255" G="255" B="255" />
550 <ColorVector ScaleY="1.0000" /> 550 <ColorVector ScaleY="1.0000" />
551 </AbstractNodeData> 551 </AbstractNodeData>
552 <AbstractNodeData Name="btn_ylc" ActionTag="1985588883" Tag="47" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="206.9816" RightMargin="843.0184" TopMargin="244.9596" BottomMargin="157.0404" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="70" Scale9Height="83" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 552 <AbstractNodeData Name="btn_ylc" ActionTag="1985588883" Tag="47" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="206.9200" RightMargin="843.0800" TopMargin="244.9920" BottomMargin="157.0080" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="70" Scale9Height="83" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
553 <Size X="230.0000" Y="318.0000" /> 553 <Size X="230.0000" Y="318.0000" />
554 <Children> 554 <Children>
555 <AbstractNodeData Name="bg" ActionTag="996661770" Tag="48" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-24.0000" RightMargin="-24.0000" ctype="SpriteObjectData"> 555 <AbstractNodeData Name="bg" ActionTag="996661770" Tag="48" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-24.0000" RightMargin="-24.0000" ctype="SpriteObjectData">
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
585 </AbstractNodeData> 585 </AbstractNodeData>
586 </Children> 586 </Children>
587 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 587 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
588 <Position X="321.9816" Y="316.0404" /> 588 <Position X="321.9200" Y="316.0080" />
589 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 589 <Scale ScaleX="1.0000" ScaleY="1.0000" />
590 <CColor A="255" R="255" G="255" B="255" /> 590 <CColor A="255" R="255" G="255" B="255" />
591 <PrePosition X="0.2515" Y="0.4389" /> 591 <PrePosition X="0.2515" Y="0.4389" />
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
597 <OutlineColor A="255" R="255" G="0" B="0" /> 597 <OutlineColor A="255" R="255" G="0" B="0" />
598 <ShadowColor A="255" R="110" G="110" B="110" /> 598 <ShadowColor A="255" R="110" G="110" B="110" />
599 </AbstractNodeData> 599 </AbstractNodeData>
600 <AbstractNodeData Name="btn_pet_grasp" ActionTag="1985645540" Tag="107" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="777.2384" RightMargin="272.7616" TopMargin="240.6397" BottomMargin="161.3603" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="70" Scale9Height="83" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 600 <AbstractNodeData Name="btn_pet_grasp" ActionTag="1985645540" Tag="107" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="777.2880" RightMargin="272.7120" TopMargin="240.6720" BottomMargin="161.3280" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="70" Scale9Height="83" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
601 <Size X="230.0000" Y="318.0000" /> 601 <Size X="230.0000" Y="318.0000" />
602 <Children> 602 <Children>
603 <AbstractNodeData Name="bg" ActionTag="-963606917" Tag="108" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-20.2510" RightMargin="-27.7490" TopMargin="3.6252" BottomMargin="-3.6252" ctype="SpriteObjectData"> 603 <AbstractNodeData Name="bg" ActionTag="-963606917" Tag="108" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-20.2510" RightMargin="-27.7490" TopMargin="3.6252" BottomMargin="-3.6252" ctype="SpriteObjectData">
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
644 </AbstractNodeData> 644 </AbstractNodeData>
645 </Children> 645 </Children>
646 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 646 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
647 <Position X="892.2384" Y="320.3603" /> 647 <Position X="892.2880" Y="320.3280" />
648 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 648 <Scale ScaleX="1.0000" ScaleY="1.0000" />
649 <CColor A="255" R="255" G="255" B="255" /> 649 <CColor A="255" R="255" G="255" B="255" />
650 <PrePosition X="0.6971" Y="0.4449" /> 650 <PrePosition X="0.6971" Y="0.4449" />
...@@ -818,6 +818,19 @@ ...@@ -818,6 +818,19 @@
818 <FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" /> 818 <FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" />
819 <BlendFunc Src="1" Dst="771" /> 819 <BlendFunc Src="1" Dst="771" />
820 </AbstractNodeData> 820 </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>
821 </Children> 834 </Children>
822 </ObjectData> 835 </ObjectData>
823 </Content> 836 </Content>
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
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="169.7397" /> 6 <Guides Direction="Horizontal" Position="88.0217" />
7 <Guides Direction="Horizontal" Position="588.8809" /> 7 <Guides Direction="Horizontal" Position="588.8809" />
8 <Guides Direction="Horizontal" Position="607.6184" /> 8 <Guides Direction="Horizontal" Position="607.6184" />
9 <Guides Direction="Horizontal" Position="628.9692" /> 9 <Guides Direction="Horizontal" Position="628.9692" />
10 <Guides Direction="Horizontal" Position="699.6442" /> 10 <Guides Direction="Horizontal" Position="699.6442" />
11 </HorizontalList> 11 </HorizontalList>
12 <VerticalList> 12 <VerticalList>
13 <Guides Position="631.5377" /> 13 <Guides Position="97.6776" />
14 <Guides Position="778.7443" /> 14 <Guides Position="371.1910" />
15 <Guides Position="1036.5959" /> 15 <Guides Position="1036.8438" />
16 </VerticalList> 16 </VerticalList>
17 </Value> 17 </Value>
18 </Item> 18 </Item>
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
6 <ObjectData Name="Layer" Tag="145" ctype="GameLayerObjectData"> 6 <ObjectData Name="Layer" Tag="145" ctype="GameLayerObjectData">
7 <Size X="790.0000" Y="506.0000" /> 7 <Size X="790.0000" Y="506.0000" />
8 <Children> 8 <Children>
9 <AbstractNodeData Name="bg_left" ActionTag="480706056" Tag="156" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="397.3014" RightMargin="-21.3014" TopMargin="19.2092" BottomMargin="0.7908" ctype="SpriteObjectData"> 9 <AbstractNodeData Name="bg_left" ActionTag="480706056" Tag="156" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="397.2710" RightMargin="-21.2710" TopMargin="19.2092" BottomMargin="0.7908" ctype="SpriteObjectData">
10 <Size X="414.0000" Y="486.0000" /> 10 <Size X="414.0000" Y="486.0000" />
11 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 11 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
12 <Position X="604.3014" Y="243.7908" /> 12 <Position X="604.2710" Y="243.7908" />
13 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 13 <Scale ScaleX="1.0000" ScaleY="1.0000" />
14 <CColor A="255" R="255" G="255" B="255" /> 14 <CColor A="255" R="255" G="255" B="255" />
15 <PrePosition X="0.7649" Y="0.4818" /> 15 <PrePosition X="0.7649" Y="0.4818" />
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 <PreSize X="0.3430" Y="0.1146" /> 87 <PreSize X="0.3430" Y="0.1146" />
88 <FileData Type="Normal" Path="ui/dress/bg_personal.png" Plist="" /> 88 <FileData Type="Normal" Path="ui/dress/bg_personal.png" Plist="" />
89 </AbstractNodeData> 89 </AbstractNodeData>
90 <AbstractNodeData Name="head" ActionTag="-1615767793" Tag="194" IconVisible="True" LeftMargin="299.1026" RightMargin="263.8975" TopMargin="81.2141" BottomMargin="125.7859" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData"> 90 <AbstractNodeData Name="head" ActionTag="-1615767793" Tag="194" IconVisible="True" LeftMargin="299.1026" RightMargin="263.8974" TopMargin="81.2141" BottomMargin="125.7859" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData">
91 <Size X="227.0000" Y="299.0000" /> 91 <Size X="227.0000" Y="299.0000" />
92 <AnchorPoint /> 92 <AnchorPoint />
93 <Position X="299.1026" Y="125.7859" /> 93 <Position X="299.1026" Y="125.7859" />
...@@ -119,10 +119,10 @@ ...@@ -119,10 +119,10 @@
119 <OutlineColor A="255" R="255" G="0" B="0" /> 119 <OutlineColor A="255" R="255" G="0" B="0" />
120 <ShadowColor A="255" R="110" G="110" B="110" /> 120 <ShadowColor A="255" R="110" G="110" B="110" />
121 </AbstractNodeData> 121 </AbstractNodeData>
122 <AbstractNodeData Name="bg_progress" ActionTag="980243771" Tag="402" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="553.9103" RightMargin="124.0897" TopMargin="42.4079" BottomMargin="439.5921" ctype="SpriteObjectData"> 122 <AbstractNodeData Name="bg_progress" ActionTag="980243771" Tag="402" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="553.8800" RightMargin="124.1200" TopMargin="42.4079" BottomMargin="439.5921" ctype="SpriteObjectData">
123 <Size X="112.0000" Y="24.0000" /> 123 <Size X="112.0000" Y="24.0000" />
124 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 124 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
125 <Position X="609.9103" Y="451.5921" /> 125 <Position X="609.8800" Y="451.5921" />
126 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 126 <Scale ScaleX="1.0000" ScaleY="1.0000" />
127 <CColor A="255" R="255" G="255" B="255" /> 127 <CColor A="255" R="255" G="255" B="255" />
128 <PrePosition X="0.7720" Y="0.8925" /> 128 <PrePosition X="0.7720" Y="0.8925" />
...@@ -130,20 +130,20 @@ ...@@ -130,20 +130,20 @@
130 <FileData Type="Normal" Path="ui/dress/bg_progress_bar.png" Plist="" /> 130 <FileData Type="Normal" Path="ui/dress/bg_progress_bar.png" Plist="" />
131 <BlendFunc Src="1" Dst="771" /> 131 <BlendFunc Src="1" Dst="771" />
132 </AbstractNodeData> 132 </AbstractNodeData>
133 <AbstractNodeData Name="LoadingBar" ActionTag="1627707755" Tag="401" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="555.0162" RightMargin="122.9838" TopMargin="42.4999" BottomMargin="439.5001" ProgressInfo="68" ctype="LoadingBarObjectData"> 133 <AbstractNodeData Name="LoadingBar" ActionTag="1627707755" Tag="401" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="554.9860" RightMargin="123.0140" TopMargin="42.4999" BottomMargin="439.5001" ProgressInfo="68" ctype="LoadingBarObjectData">
134 <Size X="112.0000" Y="24.0000" /> 134 <Size X="112.0000" Y="24.0000" />
135 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 135 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
136 <Position X="611.0162" Y="451.5001" /> 136 <Position X="610.9860" Y="451.5001" />
137 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 137 <Scale ScaleX="1.0000" ScaleY="1.0000" />
138 <CColor A="255" R="255" G="255" B="255" /> 138 <CColor A="255" R="255" G="255" B="255" />
139 <PrePosition X="0.7734" Y="0.8923" /> 139 <PrePosition X="0.7734" Y="0.8923" />
140 <PreSize X="0.1418" Y="0.0474" /> 140 <PreSize X="0.1418" Y="0.0474" />
141 <ImageFileData Type="Normal" Path="ui/dress/progress_bar.png" Plist="" /> 141 <ImageFileData Type="Normal" Path="ui/dress/progress_bar.png" Plist="" />
142 </AbstractNodeData> 142 </AbstractNodeData>
143 <AbstractNodeData Name="txt_percent" ActionTag="231490177" Tag="400" RotationSkewX="0.0385" RotationSkewY="0.0402" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="574.2798" RightMargin="145.7202" TopMargin="44.1075" BottomMargin="441.8925" FontSize="20" LabelText="100/100" HorizontalAlignmentType="HT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 143 <AbstractNodeData Name="txt_percent" ActionTag="231490177" Tag="400" RotationSkewX="0.0385" RotationSkewY="0.0402" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="574.2480" RightMargin="145.7520" TopMargin="44.1075" BottomMargin="441.8925" FontSize="20" LabelText="100/100" HorizontalAlignmentType="HT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
144 <Size X="70.0000" Y="20.0000" /> 144 <Size X="70.0000" Y="20.0000" />
145 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 145 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
146 <Position X="609.2798" Y="451.8925" /> 146 <Position X="609.2480" Y="451.8925" />
147 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 147 <Scale ScaleX="1.0000" ScaleY="1.0000" />
148 <CColor A="255" R="255" G="255" B="255" /> 148 <CColor A="255" R="255" G="255" B="255" />
149 <PrePosition X="0.7712" Y="0.8931" /> 149 <PrePosition X="0.7712" Y="0.8931" />
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
151 <OutlineColor A="255" R="255" G="0" B="0" /> 151 <OutlineColor A="255" R="255" G="0" B="0" />
152 <ShadowColor A="255" R="110" G="110" B="110" /> 152 <ShadowColor A="255" R="110" G="110" B="110" />
153 </AbstractNodeData> 153 </AbstractNodeData>
154 <AbstractNodeData Name="panel_novip" Visible="False" ActionTag="1962601428" Tag="421" IconVisible="False" LeftMargin="439.8670" RightMargin="-254.8671" TopMargin="3.8994" BottomMargin="382.1006" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData"> 154 <AbstractNodeData Name="panel_novip" ActionTag="1962601428" Tag="421" IconVisible="False" LeftMargin="439.8670" RightMargin="-254.8669" TopMargin="3.8994" BottomMargin="382.1006" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
155 <Size X="605.0000" Y="120.0000" /> 155 <Size X="605.0000" Y="120.0000" />
156 <Children> 156 <Children>
157 <AbstractNodeData Name="btn_vip" ActionTag="197998178" Tag="420" IconVisible="False" LeftMargin="202.3231" RightMargin="240.6769" TopMargin="20.8018" BottomMargin="39.1982" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 157 <AbstractNodeData Name="btn_vip" ActionTag="197998178" Tag="420" IconVisible="False" LeftMargin="202.3231" RightMargin="240.6769" TopMargin="20.8018" BottomMargin="39.1982" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
224 <FileData Type="Normal" Path="ui/dress/bg_vip_lv.png" Plist="" /> 224 <FileData Type="Normal" Path="ui/dress/bg_vip_lv.png" Plist="" />
225 <BlendFunc Src="1" Dst="771" /> 225 <BlendFunc Src="1" Dst="771" />
226 </AbstractNodeData> 226 </AbstractNodeData>
227 <AbstractNodeData Name="txt_no_vip" ActionTag="-1201631584" Tag="154" IconVisible="False" LeftMargin="476.9372" RightMargin="257.0629" TopMargin="39.5751" BottomMargin="438.4249" FontSize="28" LabelText="LV.0" HorizontalAlignmentType="HT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 227 <AbstractNodeData Name="txt_no_vip" ActionTag="-1201631584" Tag="154" IconVisible="False" LeftMargin="476.9372" RightMargin="257.0628" TopMargin="39.5751" BottomMargin="438.4249" FontSize="28" LabelText="LV.0" HorizontalAlignmentType="HT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
228 <Size X="56.0000" Y="28.0000" /> 228 <Size X="56.0000" Y="28.0000" />
229 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 229 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
230 <Position X="504.9372" Y="452.4249" /> 230 <Position X="504.9372" Y="452.4249" />
......
...@@ -369,17 +369,17 @@ ...@@ -369,17 +369,17 @@
369 <FileData Type="Normal" Path="ui/dress/bg_skill_0.png" Plist="" /> 369 <FileData Type="Normal" Path="ui/dress/bg_skill_0.png" Plist="" />
370 <BlendFunc Src="1" Dst="771" /> 370 <BlendFunc Src="1" Dst="771" />
371 </AbstractNodeData> 371 </AbstractNodeData>
372 <AbstractNodeData Name="bg_skill_1" Visible="False" ActionTag="273064865" Tag="92" IconVisible="False" LeftMargin="84.8671" RightMargin="667.1329" TopMargin="500.8260" BottomMargin="94.1740" ctype="SpriteObjectData"> 372 <AbstractNodeData Name="bg_skill_1" ActionTag="273064865" Tag="92" IconVisible="False" LeftMargin="84.8671" RightMargin="667.1329" TopMargin="500.8260" BottomMargin="94.1740" ctype="SpriteObjectData">
373 <Size X="528.0000" Y="125.0000" /> 373 <Size X="528.0000" Y="125.0000" />
374 <Children> 374 <Children>
375 <AbstractNodeData Name="txt" ActionTag="-1681692904" Tag="94" IconVisible="False" LeftMargin="123.9532" RightMargin="154.0468" TopMargin="21.1616" BottomMargin="23.8384" IsCustomSize="True" FontSize="20" LabelText="攻击祝福:&#xA;开场技能:使x个y系友方攻击+z" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 375 <AbstractNodeData Name="txt" ActionTag="-1681692904" Tag="94" IconVisible="False" LeftMargin="125.1322" RightMargin="152.8678" TopMargin="20.6687" BottomMargin="-75.6687" IsCustomSize="True" FontSize="20" LabelText="攻击祝福:&#xA;开场技能:使x个y系友方攻击+z" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
376 <Size X="250.0000" Y="80.0000" /> 376 <Size X="250.0000" Y="180.0000" />
377 <AnchorPoint ScaleY="0.5000" /> 377 <AnchorPoint ScaleY="0.5000" />
378 <Position X="123.9532" Y="63.8384" /> 378 <Position X="125.1322" Y="14.3313" />
379 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 379 <Scale ScaleX="1.0000" ScaleY="1.0000" />
380 <CColor A="255" R="74" G="74" B="74" /> 380 <CColor A="255" R="74" G="74" B="74" />
381 <PrePosition X="0.2348" Y="0.5107" /> 381 <PrePosition X="0.2370" Y="0.1147" />
382 <PreSize X="0.4735" Y="0.6400" /> 382 <PreSize X="0.4735" Y="1.4400" />
383 <OutlineColor A="255" R="255" G="0" B="0" /> 383 <OutlineColor A="255" R="255" G="0" B="0" />
384 <ShadowColor A="255" R="110" G="110" B="110" /> 384 <ShadowColor A="255" R="110" G="110" B="110" />
385 </AbstractNodeData> 385 </AbstractNodeData>
......
...@@ -165,29 +165,6 @@ ...@@ -165,29 +165,6 @@
165 <PreSize X="0.3889" Y="0.2150" /> 165 <PreSize X="0.3889" Y="0.2150" />
166 <FileData Type="Normal" Path="ui/friend/bg_friend_back_word.png" Plist="" /> 166 <FileData Type="Normal" Path="ui/friend/bg_friend_back_word.png" Plist="" />
167 </AbstractNodeData> 167 </AbstractNodeData>
168 <AbstractNodeData Name="selected" ActionTag="-971363265" Tag="52" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
169 <Size X="108.0000" Y="107.0000" />
170 <Children>
171 <AbstractNodeData Name="Image_5" ActionTag="2039357883" Tag="612" IconVisible="False" LeftMargin="33.8010" RightMargin="33.1990" TopMargin="88.2519" BottomMargin="-4.2519" LeftEage="13" RightEage="13" TopEage="7" BottomEage="7" Scale9OriginX="13" Scale9OriginY="7" Scale9Width="15" Scale9Height="9" ctype="ImageViewObjectData">
172 <Size X="41.0000" Y="23.0000" />
173 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
174 <Position X="54.3010" Y="7.2481" />
175 <Scale ScaleX="1.0000" ScaleY="1.0000" />
176 <CColor A="255" R="255" G="255" B="255" />
177 <PrePosition X="0.5028" Y="0.0677" />
178 <PreSize X="0.3796" Y="0.2150" />
179 <FileData Type="Normal" Path="ui/friend/bg_friend_exit_word.png" Plist="" />
180 </AbstractNodeData>
181 </Children>
182 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
183 <Position X="54.0000" Y="53.5000" />
184 <Scale ScaleX="1.0000" ScaleY="1.0000" />
185 <CColor A="255" R="255" G="255" B="255" />
186 <PrePosition X="0.5000" Y="0.5000" />
187 <PreSize X="1.0000" Y="1.0000" />
188 <FileData Type="Normal" Path="ui/friend/bg_friend_back.png" Plist="" />
189 <BlendFunc Src="1" Dst="771" />
190 </AbstractNodeData>
191 </Children> 168 </Children>
192 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 169 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
193 <Position X="1116.7617" Y="-172.9058" /> 170 <Position X="1116.7617" Y="-172.9058" />
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 <EndColor A="255" R="255" G="255" B="255" /> 78 <EndColor A="255" R="255" G="255" B="255" />
79 <ColorVector ScaleY="1.0000" /> 79 <ColorVector ScaleY="1.0000" />
80 </AbstractNodeData> 80 </AbstractNodeData>
81 <AbstractNodeData Name="panel_noreward" ActionTag="-1514039369" Tag="2331" IconVisible="False" LeftMargin="314.5912" RightMargin="345.4088" TopMargin="236.0287" BottomMargin="53.9713" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData"> 81 <AbstractNodeData Name="panel_noreward" Visible="False" ActionTag="-1514039369" Tag="2331" IconVisible="False" LeftMargin="314.5912" RightMargin="345.4088" TopMargin="236.0287" BottomMargin="53.9713" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
82 <Size X="620.0000" Y="430.0000" /> 82 <Size X="620.0000" Y="430.0000" />
83 <Children> 83 <Children>
84 <AbstractNodeData Name="bg_xyx_head" ActionTag="-239094221" Tag="2355" IconVisible="False" LeftMargin="210.4249" RightMargin="214.5751" TopMargin="94.5869" BottomMargin="140.4131" ctype="SpriteObjectData"> 84 <AbstractNodeData Name="bg_xyx_head" ActionTag="-239094221" Tag="2355" IconVisible="False" LeftMargin="210.4249" RightMargin="214.5751" TopMargin="94.5869" BottomMargin="140.4131" ctype="SpriteObjectData">
...@@ -105,15 +105,14 @@ ...@@ -105,15 +105,14 @@
105 <FileData Type="Normal" Path="ui/xyx/bg_xyx_head.png" Plist="" /> 105 <FileData Type="Normal" Path="ui/xyx/bg_xyx_head.png" Plist="" />
106 <BlendFunc Src="1" Dst="771" /> 106 <BlendFunc Src="1" Dst="771" />
107 </AbstractNodeData> 107 </AbstractNodeData>
108 <AbstractNodeData Name="txt" ActionTag="-207025294" Tag="2357" IconVisible="False" LeftMargin="102.7667" RightMargin="95.2333" TopMargin="267.2892" BottomMargin="127.7108" FontSize="30" LabelText="今日奖励已达上限,明日再来吧" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 108 <AbstractNodeData Name="txt" ActionTag="-207025294" Tag="2357" IconVisible="False" LeftMargin="103.7667" RightMargin="96.2333" TopMargin="269.7892" BottomMargin="130.2108" FontSize="30" LabelText="今日奖励已达上限,明日再来吧" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
109 <Size X="422.0000" Y="35.0000" /> 109 <Size X="420.0000" Y="30.0000" />
110 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 110 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
111 <Position X="313.7667" Y="145.2108" /> 111 <Position X="313.7667" Y="145.2108" />
112 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 112 <Scale ScaleX="1.0000" ScaleY="1.0000" />
113 <CColor A="255" R="0" G="96" B="189" /> 113 <CColor A="255" R="0" G="96" B="189" />
114 <PrePosition X="0.5061" Y="0.3377" /> 114 <PrePosition X="0.5061" Y="0.3377" />
115 <PreSize X="0.6806" Y="0.0814" /> 115 <PreSize X="0.6774" Y="0.0698" />
116 <FontResource Type="Normal" Path="" Plist="" />
117 <OutlineColor A="255" R="255" G="0" B="0" /> 116 <OutlineColor A="255" R="255" G="0" B="0" />
118 <ShadowColor A="255" R="110" G="110" B="110" /> 117 <ShadowColor A="255" R="110" G="110" B="110" />
119 </AbstractNodeData> 118 </AbstractNodeData>
...@@ -154,30 +153,28 @@ ...@@ -154,30 +153,28 @@
154 <AbstractNodeData Name="btn_exit" ActionTag="-1586240437" Tag="1116" IconVisible="False" LeftMargin="451.4200" RightMargin="666.5800" TopMargin="587.6454" BottomMargin="72.3546" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 153 <AbstractNodeData Name="btn_exit" ActionTag="-1586240437" Tag="1116" IconVisible="False" LeftMargin="451.4200" RightMargin="666.5800" TopMargin="587.6454" BottomMargin="72.3546" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
155 <Size X="162.0000" Y="60.0000" /> 154 <Size X="162.0000" Y="60.0000" />
156 <Children> 155 <Children>
157 <AbstractNodeData Name="txt" ActionTag="898838473" Tag="1117" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="56.0000" RightMargin="56.0000" TopMargin="13.9000" BottomMargin="18.1000" FontSize="24" LabelText="退出" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 156 <AbstractNodeData Name="txt" ActionTag="898838473" Tag="1117" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="57.0000" RightMargin="57.0000" TopMargin="15.9000" BottomMargin="20.1000" FontSize="24" LabelText="退出" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
158 <Size X="50.0000" Y="28.0000" /> 157 <Size X="48.0000" Y="24.0000" />
159 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 158 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
160 <Position X="81.0000" Y="32.1000" /> 159 <Position X="81.0000" Y="32.1000" />
161 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 160 <Scale ScaleX="1.0000" ScaleY="1.0000" />
162 <CColor A="255" R="22" G="105" B="0" /> 161 <CColor A="255" R="22" G="105" B="0" />
163 <PrePosition X="0.5000" Y="0.5350" /> 162 <PrePosition X="0.5000" Y="0.5350" />
164 <PreSize X="0.3086" Y="0.4667" /> 163 <PreSize X="0.2963" Y="0.4000" />
165 <FontResource Type="Normal" Path="" Plist="" />
166 <OutlineColor A="255" R="255" G="0" B="0" /> 164 <OutlineColor A="255" R="255" G="0" B="0" />
167 <ShadowColor A="255" R="110" G="110" B="110" /> 165 <ShadowColor A="255" R="110" G="110" B="110" />
168 </AbstractNodeData> 166 </AbstractNodeData>
169 <AbstractNodeData Name="selected" CanEdit="False" ActionTag="-75842682" VisibleForFrame="False" Tag="1118" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 167 <AbstractNodeData Name="selected" CanEdit="False" ActionTag="-75842682" VisibleForFrame="False" Tag="1118" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
170 <Size X="162.0000" Y="60.0000" /> 168 <Size X="162.0000" Y="60.0000" />
171 <Children> 169 <Children>
172 <AbstractNodeData Name="txt" ActionTag="-1826586525" Tag="1119" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="50.5000" RightMargin="50.5000" TopMargin="12.4700" BottomMargin="12.5300" FontSize="30" LabelText="退出" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 170 <AbstractNodeData Name="txt" ActionTag="-1826586525" Tag="1119" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="51.0000" RightMargin="51.0000" TopMargin="14.9700" BottomMargin="15.0300" FontSize="30" LabelText="退出" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
173 <Size X="61.0000" Y="35.0000" /> 171 <Size X="60.0000" Y="30.0000" />
174 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 172 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
175 <Position X="81.0000" Y="30.0300" /> 173 <Position X="81.0000" Y="30.0300" />
176 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 174 <Scale ScaleX="1.0000" ScaleY="1.0000" />
177 <CColor A="255" R="179" G="61" B="0" /> 175 <CColor A="255" R="179" G="61" B="0" />
178 <PrePosition X="0.5000" Y="0.5005" /> 176 <PrePosition X="0.5000" Y="0.5005" />
179 <PreSize X="0.3765" Y="0.5833" /> 177 <PreSize X="0.3704" Y="0.5000" />
180 <FontResource Type="Normal" Path="" Plist="" />
181 <OutlineColor A="255" R="255" G="0" B="0" /> 178 <OutlineColor A="255" R="255" G="0" B="0" />
182 <ShadowColor A="255" R="110" G="110" B="110" /> 179 <ShadowColor A="255" R="110" G="110" B="110" />
183 </AbstractNodeData> 180 </AbstractNodeData>
...@@ -208,30 +205,28 @@ ...@@ -208,30 +205,28 @@
208 <AbstractNodeData Name="btn_again" ActionTag="-772226635" Tag="1120" IconVisible="False" LeftMargin="648.7025" RightMargin="469.2975" TopMargin="587.6454" BottomMargin="72.3546" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 205 <AbstractNodeData Name="btn_again" ActionTag="-772226635" Tag="1120" IconVisible="False" LeftMargin="648.7025" RightMargin="469.2975" TopMargin="587.6454" BottomMargin="72.3546" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
209 <Size X="162.0000" Y="60.0000" /> 206 <Size X="162.0000" Y="60.0000" />
210 <Children> 207 <Children>
211 <AbstractNodeData Name="txt" ActionTag="-1539622166" Tag="1121" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="32.0000" RightMargin="32.0000" TopMargin="13.9000" BottomMargin="18.1000" FontSize="24" LabelText="再来一局" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 208 <AbstractNodeData Name="txt" ActionTag="-1539622166" Tag="1121" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="33.0000" RightMargin="33.0000" TopMargin="15.9000" BottomMargin="20.1000" FontSize="24" LabelText="再来一局" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
212 <Size X="98.0000" Y="28.0000" /> 209 <Size X="96.0000" Y="24.0000" />
213 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 210 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
214 <Position X="81.0000" Y="32.1000" /> 211 <Position X="81.0000" Y="32.1000" />
215 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 212 <Scale ScaleX="1.0000" ScaleY="1.0000" />
216 <CColor A="255" R="22" G="105" B="0" /> 213 <CColor A="255" R="22" G="105" B="0" />
217 <PrePosition X="0.5000" Y="0.5350" /> 214 <PrePosition X="0.5000" Y="0.5350" />
218 <PreSize X="0.6049" Y="0.4667" /> 215 <PreSize X="0.5926" Y="0.4000" />
219 <FontResource Type="Normal" Path="" Plist="" />
220 <OutlineColor A="255" R="255" G="0" B="0" /> 216 <OutlineColor A="255" R="255" G="0" B="0" />
221 <ShadowColor A="255" R="110" G="110" B="110" /> 217 <ShadowColor A="255" R="110" G="110" B="110" />
222 </AbstractNodeData> 218 </AbstractNodeData>
223 <AbstractNodeData Name="selected" CanEdit="False" ActionTag="202436045" VisibleForFrame="False" Tag="1122" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 219 <AbstractNodeData Name="selected" CanEdit="False" ActionTag="202436045" VisibleForFrame="False" Tag="1122" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
224 <Size X="162.0000" Y="60.0000" /> 220 <Size X="162.0000" Y="60.0000" />
225 <Children> 221 <Children>
226 <AbstractNodeData Name="txt" ActionTag="-782678267" Tag="1123" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="20.0000" RightMargin="20.0000" TopMargin="12.4700" BottomMargin="12.5300" FontSize="30" LabelText="再来一局" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 222 <AbstractNodeData Name="txt" ActionTag="-782678267" Tag="1123" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="21.0000" RightMargin="21.0000" TopMargin="14.9700" BottomMargin="15.0300" FontSize="30" LabelText="再来一局" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
227 <Size X="122.0000" Y="35.0000" /> 223 <Size X="120.0000" Y="30.0000" />
228 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 224 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
229 <Position X="81.0000" Y="30.0300" /> 225 <Position X="81.0000" Y="30.0300" />
230 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 226 <Scale ScaleX="1.0000" ScaleY="1.0000" />
231 <CColor A="255" R="179" G="61" B="0" /> 227 <CColor A="255" R="179" G="61" B="0" />
232 <PrePosition X="0.5000" Y="0.5005" /> 228 <PrePosition X="0.5000" Y="0.5005" />
233 <PreSize X="0.7531" Y="0.5833" /> 229 <PreSize X="0.7407" Y="0.5000" />
234 <FontResource Type="Normal" Path="" Plist="" />
235 <OutlineColor A="255" R="255" G="0" B="0" /> 230 <OutlineColor A="255" R="255" G="0" B="0" />
236 <ShadowColor A="255" R="110" G="110" B="110" /> 231 <ShadowColor A="255" R="110" G="110" B="110" />
237 </AbstractNodeData> 232 </AbstractNodeData>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <EndColor A="255" R="255" G="255" B="255" /> 19 <EndColor A="255" R="255" G="255" B="255" />
20 <ColorVector ScaleY="1.0000" /> 20 <ColorVector ScaleY="1.0000" />
21 </AbstractNodeData> 21 </AbstractNodeData>
22 <AbstractNodeData Name="panel" ActionTag="1831290102" Tag="122" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="249.6520" RightMargin="247.3480" TopMargin="103.0000" BottomMargin="101.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" LeftEage="258" RightEage="258" TopEage="170" BottomEage="170" Scale9OriginX="258" Scale9OriginY="170" Scale9Width="138" Scale9Height="89" ctype="PanelObjectData"> 22 <AbstractNodeData Name="panel" ActionTag="1831290102" Tag="122" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="249.6520" RightMargin="247.3480" TopMargin="103.0080" BottomMargin="100.9920" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" LeftEage="258" RightEage="258" TopEage="170" BottomEage="170" Scale9OriginX="258" Scale9OriginY="170" Scale9Width="138" Scale9Height="89" ctype="PanelObjectData">
23 <Size X="783.0000" Y="516.0000" /> 23 <Size X="783.0000" Y="516.0000" />
24 <Children> 24 <Children>
25 <AbstractNodeData Name="bg" ActionTag="-1886357900" Tag="24" IconVisible="False" LeftMargin="73.5000" RightMargin="74.5000" TopMargin="111.0000" BottomMargin="63.0000" LeftEage="209" RightEage="209" TopEage="112" BottomEage="112" Scale9OriginX="209" Scale9OriginY="112" Scale9Width="217" Scale9Height="118" ctype="ImageViewObjectData"> 25 <AbstractNodeData Name="bg" ActionTag="-1886357900" Tag="24" IconVisible="False" LeftMargin="73.5000" RightMargin="74.5000" TopMargin="111.0000" BottomMargin="63.0000" LeftEage="209" RightEage="209" TopEage="112" BottomEage="112" Scale9OriginX="209" Scale9OriginY="112" Scale9Width="217" Scale9Height="118" ctype="ImageViewObjectData">
...@@ -43,18 +43,18 @@ ...@@ -43,18 +43,18 @@
43 <FileData Type="Normal" Path="common/bg_pop_title.png" Plist="" /> 43 <FileData Type="Normal" Path="common/bg_pop_title.png" Plist="" />
44 <BlendFunc Src="1" Dst="771" /> 44 <BlendFunc Src="1" Dst="771" />
45 </AbstractNodeData> 45 </AbstractNodeData>
46 <AbstractNodeData Name="title_sign" ActionTag="954578371" Tag="124" IconVisible="False" LeftMargin="352.0101" RightMargin="351.9899" TopMargin="39.7318" BottomMargin="438.2682" ctype="SpriteObjectData"> 46 <AbstractNodeData Name="title_sign" ActionTag="954578371" Tag="124" IconVisible="False" LeftMargin="351.5101" RightMargin="351.4899" TopMargin="36.7318" BottomMargin="435.2682" ctype="SpriteObjectData">
47 <Size X="79.0000" Y="38.0000" /> 47 <Size X="80.0000" Y="44.0000" />
48 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 48 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
49 <Position X="391.5101" Y="457.2682" /> 49 <Position X="391.5101" Y="457.2682" />
50 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 50 <Scale ScaleX="1.0000" ScaleY="1.0000" />
51 <CColor A="255" R="255" G="255" B="255" /> 51 <CColor A="255" R="255" G="255" B="255" />
52 <PrePosition X="0.5000" Y="0.8862" /> 52 <PrePosition X="0.5000" Y="0.8862" />
53 <PreSize X="0.1009" Y="0.0736" /> 53 <PreSize X="0.1022" Y="0.0853" />
54 <FileData Type="Normal" Path="common/title_tishi.png" Plist="" /> 54 <FileData Type="Normal" Path="common/title_tishi.png" Plist="" />
55 <BlendFunc Src="1" Dst="771" /> 55 <BlendFunc Src="1" Dst="771" />
56 </AbstractNodeData> 56 </AbstractNodeData>
57 <AbstractNodeData Name="head_npc_4" ActionTag="-980162152" Tag="125" IconVisible="False" LeftMargin="175.7503" RightMargin="400.2497" TopMargin="183.6458" BottomMargin="125.3543" ctype="SpriteObjectData"> 57 <AbstractNodeData Name="head_npc_4" ActionTag="-980162152" Tag="125" IconVisible="False" LeftMargin="175.7503" RightMargin="400.2497" TopMargin="183.6457" BottomMargin="125.3543" ctype="SpriteObjectData">
58 <Size X="207.0000" Y="207.0000" /> 58 <Size X="207.0000" Y="207.0000" />
59 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 59 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
60 <Position X="279.2503" Y="228.8543" /> 60 <Position X="279.2503" Y="228.8543" />
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <FileData Type="Normal" Path="common/bg_pop_people.png" Plist="" /> 65 <FileData Type="Normal" Path="common/bg_pop_people.png" Plist="" />
66 <BlendFunc Src="1" Dst="771" /> 66 <BlendFunc Src="1" Dst="771" />
67 </AbstractNodeData> 67 </AbstractNodeData>
68 <AbstractNodeData Name="txt_title" ActionTag="1881132483" Tag="129" IconVisible="False" LeftMargin="191.8883" RightMargin="191.1117" TopMargin="126.6422" BottomMargin="309.3578" IsCustomSize="True" FontSize="40" LabelText="欢迎来到宠游乐园" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 68 <AbstractNodeData Name="txt_title" ActionTag="1881132483" Tag="129" IconVisible="False" LeftMargin="191.8883" RightMargin="191.1117" TopMargin="126.6422" BottomMargin="309.3578" IsCustomSize="True" FontSize="40" LabelText="欢迎来到宠游乐园" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
69 <Size X="400.0000" Y="80.0000" /> 69 <Size X="400.0000" Y="80.0000" />
70 <AnchorPoint ScaleY="0.5000" /> 70 <AnchorPoint ScaleY="0.5000" />
71 <Position X="191.8883" Y="349.3578" /> 71 <Position X="191.8883" Y="349.3578" />
...@@ -77,18 +77,18 @@ ...@@ -77,18 +77,18 @@
77 <OutlineColor A="255" R="0" G="0" B="0" /> 77 <OutlineColor A="255" R="0" G="0" B="0" />
78 <ShadowColor A="255" R="110" G="110" B="110" /> 78 <ShadowColor A="255" R="110" G="110" B="110" />
79 </AbstractNodeData> 79 </AbstractNodeData>
80 <AbstractNodeData Name="txt_vip" ActionTag="1644265250" Tag="1183" IconVisible="False" LeftMargin="449.6636" RightMargin="183.3364" TopMargin="241.8245" BottomMargin="244.1755" FontSize="30" LabelText="VIP经验+10" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 80 <AbstractNodeData Name="txt_vip" ActionTag="1644265250" Tag="1183" IconVisible="False" LeftMargin="447.6384" RightMargin="185.3616" TopMargin="256.0205" BottomMargin="229.9795" FontSize="30" LabelText="VIP经验+10" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
81 <Size X="150.0000" Y="30.0000" /> 81 <Size X="150.0000" Y="30.0000" />
82 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 82 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
83 <Position X="524.6636" Y="259.1755" /> 83 <Position X="522.6384" Y="244.9795" />
84 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 84 <Scale ScaleX="1.0000" ScaleY="1.0000" />
85 <CColor A="255" R="255" G="165" B="0" /> 85 <CColor A="255" R="255" G="165" B="0" />
86 <PrePosition X="0.6701" Y="0.5023" /> 86 <PrePosition X="0.6675" Y="0.4748" />
87 <PreSize X="0.1916" Y="0.0581" /> 87 <PreSize X="0.1916" Y="0.0581" />
88 <OutlineColor A="255" R="255" G="0" B="0" /> 88 <OutlineColor A="255" R="255" G="0" B="0" />
89 <ShadowColor A="255" R="110" G="110" B="110" /> 89 <ShadowColor A="255" R="110" G="110" B="110" />
90 </AbstractNodeData> 90 </AbstractNodeData>
91 <AbstractNodeData Name="txt_exp" ActionTag="34475675" Tag="1184" IconVisible="False" LeftMargin="448.4213" RightMargin="244.5787" TopMargin="290.1100" BottomMargin="195.8900" FontSize="30" LabelText="EXP+10" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 91 <AbstractNodeData Name="txt_exp" ActionTag="34475675" VisibleForFrame="False" Tag="1184" IconVisible="False" LeftMargin="448.4213" RightMargin="244.5787" TopMargin="290.1100" BottomMargin="195.8900" FontSize="30" LabelText="EXP+10" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
92 <Size X="90.0000" Y="30.0000" /> 92 <Size X="90.0000" Y="30.0000" />
93 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 93 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
94 <Position X="493.4213" Y="210.8900" /> 94 <Position X="493.4213" Y="210.8900" />
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 </AbstractNodeData> 101 </AbstractNodeData>
102 </Children> 102 </Children>
103 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 103 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
104 <Position X="641.1520" Y="359.0000" /> 104 <Position X="641.1520" Y="358.9920" />
105 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 105 <Scale ScaleX="1.0000" ScaleY="1.0000" />
106 <CColor A="255" R="255" G="255" B="255" /> 106 <CColor A="255" R="255" G="255" B="255" />
107 <PrePosition X="0.5009" Y="0.4986" /> 107 <PrePosition X="0.5009" Y="0.4986" />
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <OutlineColor A="255" R="255" G="0" B="0" /> 39 <OutlineColor A="255" R="255" G="0" B="0" />
40 <ShadowColor A="255" R="110" G="110" B="110" /> 40 <ShadowColor A="255" R="110" G="110" B="110" />
41 </AbstractNodeData> 41 </AbstractNodeData>
42 <AbstractNodeData Name="vip" ActionTag="2058042718" Tag="2358" IconVisible="False" LeftMargin="-56.4995" RightMargin="63.4995" TopMargin="-44.9741" BottomMargin="64.9741" ctype="SpriteObjectData"> 42 <AbstractNodeData Name="vip" Visible="False" ActionTag="2058042718" Tag="2358" IconVisible="False" LeftMargin="-56.4995" RightMargin="63.4995" TopMargin="-44.9741" BottomMargin="64.9741" ctype="SpriteObjectData">
43 <Size X="113.0000" Y="100.0000" /> 43 <Size X="113.0000" Y="100.0000" />
44 <Children> 44 <Children>
45 <AbstractNodeData Name="txt_1" ActionTag="536707435" Tag="2359" RotationSkewX="-40.0000" RotationSkewY="-40.0009" IconVisible="False" LeftMargin="17.1991" RightMargin="15.8009" TopMargin="68.0790" BottomMargin="1.9210" IsCustomSize="True" FontSize="20" LabelText="VIP20" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 45 <AbstractNodeData Name="txt_1" ActionTag="536707435" Tag="2359" RotationSkewX="-40.0000" RotationSkewY="-40.0009" IconVisible="False" LeftMargin="17.1991" RightMargin="15.8009" TopMargin="68.0790" BottomMargin="1.9210" IsCustomSize="True" FontSize="20" LabelText="VIP20" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
...@@ -74,6 +74,29 @@ ...@@ -74,6 +74,29 @@
74 <FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" /> 74 <FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" />
75 <BlendFunc Src="1" Dst="771" /> 75 <BlendFunc Src="1" Dst="771" />
76 </AbstractNodeData> 76 </AbstractNodeData>
77 <AbstractNodeData Name="vip2" ActionTag="-36182107" VisibleForFrame="False" Tag="573" IconVisible="False" LeftMargin="-48.7332" RightMargin="55.7332" TopMargin="-37.4389" BottomMargin="57.4389" LeftEage="38" RightEage="38" TopEage="21" BottomEage="21" Scale9OriginX="38" Scale9OriginY="21" Scale9Width="37" Scale9Height="58" ctype="ImageViewObjectData">
78 <Size X="113.0000" Y="100.0000" />
79 <Children>
80 <AbstractNodeData Name="txt_1_0" ActionTag="-2061551736" Tag="574" RotationSkewX="-40.0000" RotationSkewY="-40.0009" IconVisible="False" LeftMargin="27.2002" RightMargin="5.7998" TopMargin="62.2590" BottomMargin="7.7410" IsCustomSize="True" FontSize="20" LabelText="VIP X 2" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
81 <Size X="80.0000" Y="30.0000" />
82 <AnchorPoint ScaleY="0.5000" />
83 <Position X="27.2002" Y="22.7410" />
84 <Scale ScaleX="1.0000" ScaleY="1.0000" />
85 <CColor A="255" R="246" G="121" B="19" />
86 <PrePosition X="0.2407" Y="0.2274" />
87 <PreSize X="0.7080" Y="0.3000" />
88 <OutlineColor A="255" R="255" G="0" B="0" />
89 <ShadowColor A="255" R="110" G="110" B="110" />
90 </AbstractNodeData>
91 </Children>
92 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
93 <Position X="7.7668" Y="107.4389" />
94 <Scale ScaleX="1.0000" ScaleY="1.0000" />
95 <CColor A="255" R="255" G="255" B="255" />
96 <PrePosition X="0.0647" Y="0.8953" />
97 <PreSize X="0.9417" Y="0.8333" />
98 <FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" />
99 </AbstractNodeData>
77 </Children> 100 </Children>
78 </ObjectData> 101 </ObjectData>
79 </Content> 102 </Content>
......
...@@ -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/task/TaskLayer.csd" />
35 <FilePathData Path="ui/sign/SignLayer.csd" />
36 </OpenedDocuments>
37 <ActiveDocument Path="ui/sign/SignLayer.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
......
...@@ -72,6 +72,8 @@ enum USER_EVENT_TYPE ...@@ -72,6 +72,8 @@ enum USER_EVENT_TYPE
72 DAILY_EVENT_PLAY_GAME_CNT = 10000022;//每日玩小游戏次数 id:0, data:次数 72 DAILY_EVENT_PLAY_GAME_CNT = 10000022;//每日玩小游戏次数 id:0, data:次数
73 DAILY_EVENT_PLAY_GAME_PK_CNT = 10000023;//每日玩小游戏pk次数 id:0, data:次数 73 DAILY_EVENT_PLAY_GAME_PK_CNT = 10000023;//每日玩小游戏pk次数 id:0, data:次数
74 DAILY_EVENT_PLAY_PK_CNT = 10000024;//每日pk次数 id:0, data:次数 74 DAILY_EVENT_PLAY_PK_CNT = 10000024;//每日pk次数 id:0, data:次数
75
76 DAILY_EVENT_PK_ADD_EXP_CNT = 10000025;//每日pk获得exp数量 id:0, data:exp获得数量
75 DAILY_EVENT_END = 19999999; 77 DAILY_EVENT_END = 19999999;
76 //---------------------------------------------------------------------------- 78 //----------------------------------------------------------------------------
77 79
...@@ -105,7 +107,7 @@ enum USER_EVENT_TYPE ...@@ -105,7 +107,7 @@ enum USER_EVENT_TYPE
105 FOREVER_EVENT_IN_ROOM_PET = 40000001;//房间中的宠物,id:位置序号,data:pet id 107 FOREVER_EVENT_IN_ROOM_PET = 40000001;//房间中的宠物,id:位置序号,data:pet id
106 FOREVER_EVENT_ROLE_WALL = 40000002;//使用的墙,id:0,data:墙纸ID 108 FOREVER_EVENT_ROLE_WALL = 40000002;//使用的墙,id:0,data:墙纸ID
107 FOREVER_EVENT_ROLE_CLOTHES = 40000003;//穿上的衣服,id:部位(share_msg.E_USER_BODY_TYPE),data:衣服ID 109 FOREVER_EVENT_ROLE_CLOTHES = 40000003;//穿上的衣服,id:部位(share_msg.E_USER_BODY_TYPE),data:衣服ID
108 FOREVER_EVENT_ROLE_LEVEL = 40000004;//等级,id:0,data:经验值 110 // FOREVER_EVENT_ROLE_LEVEL = 40000004;//等级,id:0,data:经验值
109 FOREVER_EVENT_ROLE_REWARD = 40000005;//新手礼包,id:0,data:role_reward id, time:领取的时间 111 FOREVER_EVENT_ROLE_REWARD = 40000005;//新手礼包,id:0,data:role_reward id, time:领取的时间
110 FOREVER_EVENT_WX_LOGIN_REWARD = 40000006;//微信登录礼包,id:0,data:1(已领取) 112 FOREVER_EVENT_WX_LOGIN_REWARD = 40000006;//微信登录礼包,id:0,data:1(已领取)
111 FOREVER_EVENT_FIRST_PAY = 40000007;//首充,id:pay.xml中的id 113 FOREVER_EVENT_FIRST_PAY = 40000007;//首充,id:pay.xml中的id
...@@ -137,7 +139,10 @@ enum USER_EVENT_TYPE ...@@ -137,7 +139,10 @@ enum USER_EVENT_TYPE
137 FOREVER_EVENT_GAME_PK_VAL = 40000031;//小游戏PK值 id:0 data:PK值(share_msg::E_GAME_PK_VAL_DEF 初始值代表0) 139 FOREVER_EVENT_GAME_PK_VAL = 40000031;//小游戏PK值 id:0 data:PK值(share_msg::E_GAME_PK_VAL_DEF 初始值代表0)
138 140
139 FOREVER_EVENT_BTL_TEAM_ID = 40000032;//战斗战队 id:0,data:首发队伍ID 141 FOREVER_EVENT_BTL_TEAM_ID = 40000032;//战斗战队 id:0,data:首发队伍ID
140 142 FOREVER_EVENT_ACTIVE = 40000033;//活动信息 id:active.xml中的id,data:状态(0:未完成, 1:完成未领取, 2:完成已领取)
143
144
145
141 FOREVER_EVENT_STATISITCS_FIRST_PAY = 40001001;//统计,第一次充值.id:0,data:0 146 FOREVER_EVENT_STATISITCS_FIRST_PAY = 40001001;//统计,第一次充值.id:0,data:0
142 147
143 FOREVER_EVENT_ACHIEVEMENT = 40002000;//成就系统 40002000+成就ID ,id:0,data:完成的数据,str_data:领取过奖励的节点,(id,id,id) 148 FOREVER_EVENT_ACHIEVEMENT = 40002000;//成就系统 40002000+成就ID ,id:0,data:完成的数据,str_data:领取过奖励的节点,(id,id,id)
...@@ -198,6 +203,19 @@ enum E_STATISTICS_TYPE ...@@ -198,6 +203,19 @@ enum E_STATISTICS_TYPE
198 203
199 E_STATISTICS_TYPE_6 = 6;//注册 204 E_STATISTICS_TYPE_6 = 6;//注册
200 E_STATISTICS_TYPE_7 = 7;//第一次付费 205 E_STATISTICS_TYPE_7 = 7;//第一次付费
206
207 E_STATISTICS_TYPE_8 = 8;//下线(在线时长-秒)
208
209 E_STATISTICS_TYPE_9 = 9;//小游戏次数(游戏ID,难度)
210 E_STATISTICS_TYPE_10 = 10;//宠物转盘抽奖(抽奖等级)
211 E_STATISTICS_TYPE_11 = 11;//宠物PK
212 E_STATISTICS_TYPE_12 = 12;//小游戏好友PK
213 E_STATISTICS_TYPE_13 = 13;//完成每日任务(任务ID)
214
215 E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID)
216
217
218
201 } 219 }
202 220
203 //聊天类型ok 221 //聊天类型ok
......
...@@ -74,7 +74,7 @@ message login_msg_res ...@@ -74,7 +74,7 @@ message login_msg_res
74 repeated achievement_t achievement = 30;//成就 74 repeated achievement_t achievement = 30;//成就
75 //optional uint32 pet_btl_cnt = 32;//出战宠物,次数 75 //optional uint32 pet_btl_cnt = 32;//出战宠物,次数
76 optional uint32 pet_btl_win_cnt = 33;//出战宠物,胜场 76 optional uint32 pet_btl_win_cnt = 33;//出战宠物,胜场
77 optional uint32 pet_btl_exp = 34;//出战宠物,胜点 77 optional uint32 pet_btl_exp = 34;//出战宠物,胜点//[废弃]
78 //optional uint32 pet_btl_time = 35;//可出战宠物,时间 78 //optional uint32 pet_btl_time = 35;//可出战宠物,时间
79 repeated uint32 received_duanwei_lv_reward = 36;//领取过的段位等级奖励 79 repeated uint32 received_duanwei_lv_reward = 36;//领取过的段位等级奖励
80 repeated uint32 free_game_id = 37;//可玩的包月小游戏 80 repeated uint32 free_game_id = 37;//可玩的包月小游戏
...@@ -91,6 +91,8 @@ message login_msg_res ...@@ -91,6 +91,8 @@ message login_msg_res
91 optional uint32 pk_win = 48;//pk,胜利次数 91 optional uint32 pk_win = 48;//pk,胜利次数
92 optional uint32 pk_val = 49;//pk值 92 optional uint32 pk_val = 49;//pk值
93 optional uint32 pk_daily_cnt = 50;//每日已pk次数 93 optional uint32 pk_daily_cnt = 50;//每日已pk次数
94
95 repeated share_msg.key_val_t active_data = 51;//活动信息 key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
94 } 96 }
95 97
96 message create_role_msg//1,0x00104#创建角色 98 message create_role_msg//1,0x00104#创建角色
...@@ -460,7 +462,7 @@ message notify_task_daily_msg//0,0x00501#通知,每日任务 ...@@ -460,7 +462,7 @@ message notify_task_daily_msg//0,0x00501#通知,每日任务
460 462
461 message notify_task_daily_msg_res 463 message notify_task_daily_msg_res
462 { 464 {
463 repeated task_daily_t task_daily = 5;//每日任务(5无意义,只是代表protuf一个唯一的序号标记) 465 repeated task_daily_t task_daily = 5;//每日任务
464 } 466 }
465 467
466 message get_task_daily_reward_msg//1,0x00502#领取每日任务的奖励 468 message get_task_daily_reward_msg//1,0x00502#领取每日任务的奖励
...@@ -483,6 +485,25 @@ message get_task_daily_reward_msg_res ...@@ -483,6 +485,25 @@ message get_task_daily_reward_msg_res
483 // repeated task_daily_t task_daily = 5;//每日任务 485 // repeated task_daily_t task_daily = 5;//每日任务
484 //} 486 //}
485 487
488
489 message notify_active_msg//0,0x00504#通知,改变的活动数据
490 {
491 }
492
493 message notify_active_msg_res
494 {
495 repeated share_msg.key_val_t active_data = 1;//活动信息 key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
496 }
497
498 message get_active_reward_msg//1,0x00505#领取活动的奖励
499 {
500 optional uint32 id = 1;//活动ID
501
502 }
503
504 message get_active_reward_msg_res
505 {
506 }
486 //////////////////////////////////////////////// 507 ////////////////////////////////////////////////
487 //道具[0x00600,0x006ff] 508 //道具[0x00600,0x006ff]
488 //////////////////////////////////////////////// 509 ////////////////////////////////////////////////
...@@ -798,6 +819,7 @@ message notify_game_end_msg_res ...@@ -798,6 +819,7 @@ message notify_game_end_msg_res
798 optional share_msg.btl_t btl = 2;//战斗数据 819 optional share_msg.btl_t btl = 2;//战斗数据
799 optional uint32 add_money = 3;//增加的钱 820 optional uint32 add_money = 3;//增加的钱
800 optional int32 change_score = 4;//积分变化 821 optional int32 change_score = 4;//积分变化
822 optional uint32 add_exp = 5;//增加的exp
801 } 823 }
802 824
803 message get_btl_team_msg//1,0x1007#获取战队 825 message get_btl_team_msg//1,0x1007#获取战队
......
...@@ -39,9 +39,10 @@ enum E_PLATFORM ...@@ -39,9 +39,10 @@ enum E_PLATFORM
39 39
40 E_PLATFORM_XHX_TEST = 100;//测试网络 40 E_PLATFORM_XHX_TEST = 100;//测试网络
41 E_PLATFORM_XHX_WANG_SU = 101;//网宿 41 E_PLATFORM_XHX_WANG_SU = 101;//网宿
42 E_PLATFORM_XHX_TIANJING_LIANGTONG_TEST = 102;//T天津联通 42 //E_PLATFORM_XHX_TIANJING_LIANGTONG_TEST = 102;//T天津联通
43 E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通 43 E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通
44 E_PLATFORM_XHX_DANG_BEI = 104;//当贝 44 E_PLATFORM_XHX_DANG_BEI = 104;//当贝
45 E_PLATFORM_XHX_DA_TANG = 105;//大唐
45 46
46 47
47 48
...@@ -105,8 +106,9 @@ enum E_PET_BUF{ ...@@ -105,8 +106,9 @@ enum E_PET_BUF{
105 E_PET_BUF_ADD_ACK_ZHUDONG = 102;//102:增加攻击p1点 主动攻击时候才可用 106 E_PET_BUF_ADD_ACK_ZHUDONG = 102;//102:增加攻击p1点 主动攻击时候才可用
106 107
107 //[200,300) 范围是被动 添加的 附近影响的buf 108 //[200,300) 范围是被动 添加的 附近影响的buf
108 E_PET_BUF_NEAR_ADD_ACK = 200;//100:增加攻击p1点 109 E_PET_BUF_NEAR_ADD_ACK = 200;//增加攻击p1点, 由p3宠物key触发
109 E_PET_BUF_NEAR_ADD_HP = 201;//101:增加hp,p1点 110 E_PET_BUF_NEAR_ADD_HP = 201;//增加hp,p1点, 由p3宠物key触发
111 E_PET_BUF_NEAR_CHAOFENG = 202;//嘲讽, 由p3宠物key触发
110 } 112 }
111 113
112 //通告 114 //通告
...@@ -275,7 +277,7 @@ message pet_btl_buf_update_t ...@@ -275,7 +277,7 @@ message pet_btl_buf_update_t
275 optional int32 time = 3;//有效次数 277 optional int32 time = 3;//有效次数
276 optional int32 round = 4;//持续回合数 278 optional int32 round = 4;//持续回合数
277 optional int32 param1 = 5; 279 optional int32 param1 = 5;
278 optional int32 param2 = 6; 280 optional int32 param2 = 6;//(增加的血量上限)
279 optional int32 param3 = 7; 281 optional int32 param3 = 7;
280 } 282 }
281 283
...@@ -383,6 +385,7 @@ message user_show_t ...@@ -383,6 +385,7 @@ message user_show_t
383 385
384 optional uint32 pk_cnt = 14;//pk次数 386 optional uint32 pk_cnt = 14;//pk次数
385 optional uint32 pk_win_cnt = 15;//pk获胜次数 387 optional uint32 pk_win_cnt = 15;//pk获胜次数
388 optional uint32 pk_val = 16;//PK值
386 } 389 }
387 390
388 //用户显示数据 391 //用户显示数据
......
...@@ -37,6 +37,6 @@ BIND_PROTO_CMD_NO_CB(0x10021008,on_update_yesterday_btl_rank_msg,update_yesterda ...@@ -37,6 +37,6 @@ BIND_PROTO_CMD_NO_CB(0x10021008,on_update_yesterday_btl_rank_msg,update_yesterda
37 BIND_PROTO_CMD_NO_CB(0x1002100a,on_delete_yesterday_btl_rank_msg,delete_yesterday_btl_rank_msg); 37 BIND_PROTO_CMD_NO_CB(0x1002100a,on_delete_yesterday_btl_rank_msg,delete_yesterday_btl_rank_msg);
38 BIND_PROTO_CMD_NO_CB(0x1002100c,on_delete_user_btl_rank_msg,delete_user_btl_rank_msg); 38 BIND_PROTO_CMD_NO_CB(0x1002100c,on_delete_user_btl_rank_msg,delete_user_btl_rank_msg);
39 BIND_PROTO_CMD(0x1002100d,on_random_friend_msg,random_friend_msg); 39 BIND_PROTO_CMD(0x1002100d,on_random_friend_msg,random_friend_msg);
40 BIND_PROTO_CMD(0x1002100e,on_check_uid_msg,check_uid_msg); 40 BIND_PROTO_CMD(0x1002100f,on_check_uid_msg,check_uid_msg);
41 BIND_PROTO_CMD_NO_CB(0x10021010,on_update_exprie_rank_msg,update_exprie_rank_msg); 41 BIND_PROTO_CMD_NO_CB(0x10021010,on_update_exprie_rank_msg,update_exprie_rank_msg);
42 BIND_PROTO_CMD_NO_CB(0x10021012,on_delete_exprie_rank_msg,delete_exprie_rank_msg); 42 BIND_PROTO_CMD_NO_CB(0x10021012,on_delete_exprie_rank_msg,delete_exprie_rank_msg);
......
...@@ -34,20 +34,15 @@ BIND_PROTO_CMD(0x0410,on_flower_msg,flower_msg); ...@@ -34,20 +34,15 @@ BIND_PROTO_CMD(0x0410,on_flower_msg,flower_msg);
34 BIND_PROTO_CMD(0x0411,on_update_msg,update_msg); 34 BIND_PROTO_CMD(0x0411,on_update_msg,update_msg);
35 BIND_PROTO_CMD_NO_CB(0x00501,on_notify_task_daily_msg,notify_task_daily_msg); 35 BIND_PROTO_CMD_NO_CB(0x00501,on_notify_task_daily_msg,notify_task_daily_msg);
36 BIND_PROTO_CMD(0x00502,on_get_task_daily_reward_msg,get_task_daily_reward_msg); 36 BIND_PROTO_CMD(0x00502,on_get_task_daily_reward_msg,get_task_daily_reward_msg);
37 BIND_PROTO_CMD_NO_CB(0x00504,on_notify_active_msg,notify_active_msg);
38 BIND_PROTO_CMD(0x00505,on_get_active_reward_msg,get_active_reward_msg);
37 BIND_PROTO_CMD_NO_CB(0x0601,on_notify_item_msg,notify_item_msg); 39 BIND_PROTO_CMD_NO_CB(0x0601,on_notify_item_msg,notify_item_msg);
38 BIND_PROTO_CMD(0x0602,on_pet_btl_msg,pet_btl_msg);
39 BIND_PROTO_CMD(0x0603,on_use_item_msg,use_item_msg); 40 BIND_PROTO_CMD(0x0603,on_use_item_msg,use_item_msg);
40 BIND_PROTO_CMD(0x0604,on_pet_eat_msg,pet_eat_msg); 41 BIND_PROTO_CMD(0x0604,on_pet_eat_msg,pet_eat_msg);
41 BIND_PROTO_CMD(0x0605,on_pet_sell_msg,pet_sell_msg); 42 BIND_PROTO_CMD(0x0605,on_pet_sell_msg,pet_sell_msg);
42 BIND_PROTO_CMD_NO_CB(0x0606,on_notify_item_cnt_max_msg,notify_item_cnt_max_msg); 43 BIND_PROTO_CMD_NO_CB(0x0606,on_notify_item_cnt_max_msg,notify_item_cnt_max_msg);
43 BIND_PROTO_CMD(0x0607,on_btl_msg,btl_msg);
44 BIND_PROTO_CMD_NO_CB(0x0608,on_notify_btl_begin_msg,notify_btl_begin_msg);
45 BIND_PROTO_CMD(0x0609,on_btl_shoot_msg,btl_shoot_msg);
46 BIND_PROTO_CMD_NO_CB(0x060a,on_notify_btl_ret_msg,notify_btl_ret_msg);
47 BIND_PROTO_CMD_NO_CB(0x060b,on_notify_btl_end_ret_msg,notify_btl_end_ret_msg);
48 BIND_PROTO_CMD(0x060c,on_get_duanwei_lv_reward_msg,get_duanwei_lv_reward_msg);
49 BIND_PROTO_CMD(0x060d,on_get_btl_rank_reward_msg,get_btl_rank_reward_msg);
50 BIND_PROTO_CMD_NO_CB(0x060e,on_notify_pet_msg,notify_pet_msg); 44 BIND_PROTO_CMD_NO_CB(0x060e,on_notify_pet_msg,notify_pet_msg);
45 BIND_PROTO_CMD(0x060f,on_pet_open_skill_msg,pet_open_skill_msg);
51 BIND_PROTO_CMD(0x00701,on_sign_msg,sign_msg); 46 BIND_PROTO_CMD(0x00701,on_sign_msg,sign_msg);
52 BIND_PROTO_CMD(0x00702,on_sign_reward_msg,sign_reward_msg); 47 BIND_PROTO_CMD(0x00702,on_sign_reward_msg,sign_reward_msg);
53 BIND_PROTO_CMD(0x00703,on_sign_update_msg,sign_update_msg); 48 BIND_PROTO_CMD(0x00703,on_sign_update_msg,sign_update_msg);
......