Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6edf5f05 6edf5f057bdf4ec0fc76495a09568e318676e469 by jinwawa
Options

0529_

1 parent e835002c
Inline Side-by-side
Showing 137 changed files with 613 additions and 150 deletions
This diff could not be displayed because it is too large.
......@@ -290,4 +290,81 @@
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
<!--10.21-10.27 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
<!--10.28-11.3 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
<!--11.4-11.10 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
<!--11.11-11.17 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
<!--11.18-11.24 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
<!--11.25-12.1 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
<!--12.2-12.8 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
<!--12.9-12.15 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
<!--12.16-12.22 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
<!--12.23-12.29 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
<!--12.30-1.5 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
</root>
......
This diff could not be displayed because it is too large.
......@@ -290,4 +290,81 @@
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
<!--10.21-10.27 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
<!--10.28-11.3 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
<!--11.4-11.10 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
<!--11.11-11.17 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
<!--11.18-11.24 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
<!--11.25-12.1 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
<!--12.2-12.8 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
<!--12.9-12.15 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
<!--12.16-12.22 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
<!--12.23-12.29 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
<!--12.30-1.5 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
</root>
......
This diff could not be displayed because it is too large.
......@@ -290,4 +290,81 @@
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
<!--10.21-10.27 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
<!--10.28-11.3 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
<!--11.4-11.10 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
<!--11.11-11.17 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
<!--11.18-11.24 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
<!--11.25-12.1 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
<!--12.2-12.8 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
<!--12.9-12.15 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
<!--12.16-12.22 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
<!--12.23-12.29 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
<!--12.30-1.5 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
</root>
......
<?xml version="1.0" encoding="UTF-8"?>
<userDefaultRoot>
<!--m0800279afc6c-->
<Account>m0800279afc6d</Account>
<!--m0800278b87c2-->
<Account>m0800279afc6c</Account>
<exp>0</exp>
<versionnum>201801291657</versionnum>
<isMusic>0</isMusic>
......@@ -24,7 +25,7 @@
<new_guide_step>4</new_guide_step>
<is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
<feiyanzoubi_best>376</feiyanzoubi_best>
<uid>1030100010142889</uid>
<uid>1030100010142914</uid>
<is_bird_game_guide>1</is_bird_game_guide>
<bird_best>1008</bird_best>
<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 @@
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="41" gameid="7" timeBegin="1571587200" timeEnd="1572191999" item50="200002,1;300002,1;600002,10">
<!--10.21-10.27 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="42" gameid="5" timeBegin="1572192000" timeEnd="1572796799" item50="200002,1;300002,1;600002,10">
<!--10.28-11.3 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="43" gameid="9" timeBegin="1572796800" timeEnd="1573401599" item50="200002,1;300002,1;600002,10">
<!--11.4-11.10 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="44" gameid="8" timeBegin="1573401600" timeEnd="1574006399" item50="200002,1;300002,1;600002,10">
<!--11.11-11.17 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="45" gameid="7" timeBegin="1574006400" timeEnd="1574611199" item50="200002,1;300002,1;600002,10">
<!--11.18-11.24 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="46" gameid="5" timeBegin="1574611200" timeEnd="1575215999" item50="200002,1;300002,1;600002,10">
<!--11.25-12.1 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="47" gameid="9" timeBegin="1575216000" timeEnd="1575820799" item50="200002,1;300002,1;600002,10">
<!--12.2-12.8 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="48" gameid="8" timeBegin="1575820800" timeEnd="1576425599" item50="200002,1;300002,1;600002,10">
<!--12.9-12.15 旋转海盗-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="49" gameid="7" timeBegin="1576425600" timeEnd="1577030399" item50="200002,1;300002,1;600002,10">
<!--12.16-12.22 奔跑吧兔子-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="50" gameid="5" timeBegin="1577030400" timeEnd="1577635199" item50="200002,1;300002,1;600002,10">
<!--12.23-12.29 接糖果-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
<data id="51" gameid="9" timeBegin="1577635200" timeEnd="1578239999" item50="200002,1;300002,1;600002,10">
<!--12.30-1.5 飞檐走壁-->
<reward noBegin="1" noEnd="1" item="200006,1;300006,1;600004,10"/>
<reward noBegin="2" noEnd="5" item="200005,1;300005,1;600006,10"/>
<reward noBegin="6" noEnd="10" item="200004,1;300004,1;600003,10"/>
<reward noBegin="11" noEnd="30" item="200003,1;300003,1;600002,10"/>
</data>
</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)
-- UserModel.pets[10002] = {id=10002,val=1,exp=105,cnt=9};
-- UserModel.pets[10003] = {id=10003,val=1,exp=105,cnt=16};
UserModel.pet_id = {};
UserModel.pet_id = {}; --房间中的宠物，key:idx位置序号, val1:pet_id宠物id
for i,v in ipairs(params.data.pet_id) do
UserModel.pet_id[#UserModel.pet_id+1] = {id=v.val1,idx=v.key};
end
......@@ -912,6 +912,10 @@ function UserModel.getLeftVipDay()
end
end
if NEED_PAY==0 then --大唐版本所有的用户都是VIP
left_day_num=100;
end
return left_day_num;
end
......@@ -1068,6 +1072,7 @@ function UserModel.remove_home_pet(id)
end
end
--筛选还有放宠物空位置
function UserModel.get_empty_pet_pos()
local idx = 0;
for i=1,5 do
......
......@@ -17,6 +17,7 @@ isUpdateInit = false;
function LoadingScene:ctor(params)
print("loading scene params:",params);
if params then
self.nextSceneName = params.nextSceneName;
self.nextParams = params;
......
......@@ -5,11 +5,11 @@ require("app.views.view.HeadImageSprite");
MainScene.gm_id = 100001;
local pets_pos_list = { };
pets_pos_list[#pets_pos_list + 1] = { x = 288, y = 82 };
pets_pos_list[#pets_pos_list + 1] = { x = 495, y = 167 };
pets_pos_list[#pets_pos_list + 1] = { x = 635, y = 52 };
pets_pos_list[#pets_pos_list + 1] = { x = 806, y = 172 };
pets_pos_list[#pets_pos_list + 1] = { x = 1153, y = 76 };
pets_pos_list[#pets_pos_list + 1] = { x = 100, y = 82 };
pets_pos_list[#pets_pos_list + 1] = { x = 371, y = 12 };
pets_pos_list[#pets_pos_list + 1] = { x = 600, y = 62 };
pets_pos_list[#pets_pos_list + 1] = { x = 800, y = 45 };
pets_pos_list[#pets_pos_list + 1] = { x = 1030, y = 76 };
function MainScene:ctor(params)
GAME_ID = 0;
......@@ -19,6 +19,7 @@ function MainScene:ctor(params)
end
function MainScene:onCreate(params)
logD("enter MainScene----------------------------->");
self.keypadManager = KeypadManager:create(self);
self.ui = cc.CSLoader:createNode("ui/MainScene.csb");
......@@ -41,6 +42,7 @@ function MainScene:onCreate(params)
self.wall = self.ui:getChildByName("wall");
self.panel_decorate = self.ui:getChildByName("panel_decorate");
self.panel_decorate_pet = self.ui:getChildByName("panel_decorate_pet");
self.mask_area_1 = self.ui:getChildByName("mask_area_1");
self.mask_area_2 = self.ui:getChildByName("mask_area_2");
self.mask_area_1:setVisible(false);
......@@ -168,6 +170,7 @@ function MainScene:onCreate(params)
SoundManager.playMusic("res/sound/bg_music_hall.mp3");
self.panel_decorate:removeAllChildren();
self.panel_decorate_pet:removeAllChildren();
self:showPets();
self:showHallDecorate();
self:update_role_show();
......@@ -230,6 +233,7 @@ function MainScene:onLoginSuccess(params)
SoundManager.playMusic("res/sound/bg_music_hall.mp3");
self.panel_decorate:removeAllChildren();
self.panel_decorate_pet:removeAllChildren();
self:showPets();
self:showHallDecorate();
self:update_role_show();
......@@ -461,18 +465,20 @@ function MainScene:showPets()
end
function MainScene:addPet(id, idx)
local pet_info = PetInfo.get_pet_info(id);
local sp = cc.Sprite:create("res/pet/icon/" .. id .. ".png");
sp:setName("pet_" .. id);
sp:setAnchorPoint(cc.p(0.5, 0));
sp:setPosition(pets_pos_list[idx]);
sp:setScale(pet_info.scale);
self.panel_decorate:addChild(sp);
self.panel_decorate_pet:addChild(sp);
print("------------------- add pet:", id, idx);
end
function MainScene:removePet(id)
local sp = self.panel_decorate:getChildByName("pet_" .. id);
local sp = self.panel_decorate_pet:getChildByName("pet_" .. id);
if sp then
sp:removeSelf();
end
......@@ -654,6 +660,11 @@ function MainScene:onFriendClick()
cmsg.on("gateway_msg.get_peer_user_home_msg_res", self.handlerUserHomeInfoResFun);
SocketClient:getInstance():send("gateway_msg.get_peer_user_home_msg", { uid = UserModel.user_info.uid });
end
--装饰界面需要隐藏游乐场、宠物pk、抓宠物
self.btn_ylc:setVisible(false);
self.btn_cwy:setVisible(false);
self.btn_grasp:setVisible(false);
end
function MainScene:onUserHomeInfoResFun(params)
......@@ -672,6 +683,12 @@ function MainScene:onDecorateClick()
Alert.showOne(strings.msg_1002);
return;
end
--装饰界面需要隐藏游乐场、宠物pk、抓宠物
self.btn_ylc:setVisible(false);
self.btn_cwy:setVisible(false);
self.btn_grasp:setVisible(false);
local reciever = require("app.views.view.DecorateView"):show();
self.keypadManager:addKeypadReceiver(reciever);
end
......
local OtherHomeScene = class("OtherHomeScene", import(".BaseSceneNew"));
local pets_pos_list = {};
pets_pos_list[#pets_pos_list+1] = {x=288,y=82};
pets_pos_list[#pets_pos_list+1] = {x=495,y=167};
pets_pos_list[#pets_pos_list+1] = {x=635,y=52};
pets_pos_list[#pets_pos_list+1] = {x=806,y=172};
pets_pos_list[#pets_pos_list+1] = {x=1153,y=76};
local pets_pos_list = { };
pets_pos_list[#pets_pos_list + 1] = { x = 100, y = 82 };
pets_pos_list[#pets_pos_list + 1] = { x = 371, y = 12 };
pets_pos_list[#pets_pos_list + 1] = { x = 600, y = 62 };
pets_pos_list[#pets_pos_list + 1] = { x = 800, y = 45 };
pets_pos_list[#pets_pos_list + 1] = { x = 1100, y = 76 };
function OtherHomeScene:ctor(params)
OtherHomeScene.super.ctor(self);
......@@ -41,6 +41,8 @@ function OtherHomeScene:onCreate(params)
self.btn_ylc:setVisible(false);
self.btn_cwy = self.ui:getChildByName("btn_pet_pk");
self.btn_cwy:setVisible(false);
self.btn_grasp = self.ui:getChildByName("btn_pet_grasp");
self.btn_grasp:setVisible(false);
self.btn_activity = self.ui:getChildByName("panel_top"):getChildByName("btn_activity");
self.btn_activity:setVisible(false);
self.btn_task = self.ui:getChildByName("panel_top"):getChildByName("btn_task");
......
......@@ -23,7 +23,8 @@ function PetPkScene:onCreate(params)
self.win_uid = params.btl.win_uid;
self.add_money = params.add_money;
self.change_score = params.change_score;
print("宠物战斗增加金币："..self.add_money,"积分："..self.change_score);
self.add_exp = params.add_exp;
print("宠物战斗增加金币："..self.add_money,"积分："..self.change_score,"经验："..self.add_exp);
UserModel.user_info.pk_val=UserModel.user_info.pk_val+self.change_score;
self.ui = cc.CSLoader:createNode("ui/pet/PetPkScene.csb");
......@@ -131,7 +132,7 @@ function PetPkScene:show_round()
self:show_round_buff(btl_round_data);
else
print("show round over! winner :",UserModel.changeUidToString(self.win_uid));
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));
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));
self.keypadManager:addKeypadReceiver(reciever);
end
end
......@@ -223,7 +224,7 @@ function PetPkScene:show_table_pet_item(_parent,team_list,vv)
if cc.FileUtils:getInstance():isFileExist(icon_url) then
item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
end
item:getChildByName("icon"):setScale(pet_info.scale);
--item:getChildByName("icon"):setScale(pet_info.scale); --不再需要放大或缩小
icon_url = "res/pet/attr_"..pet_info.attr..".png";
if cc.FileUtils:getInstance():isFileExist(icon_url) then
item:getChildByName("attr"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
......@@ -909,7 +910,7 @@ function PetPkScene:onNotifyGameEndCallBackFun(params)
cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
local btl = params.data.btl;
app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score});
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});
end
--返回键处理函数
......
......@@ -24,6 +24,7 @@ function DecorateView:show()
end
function DecorateView:init()
self.panel = self:getChildByName("panel");
self.btn_back = self.panel:getChildByName("btn_back");
self.btn_back.fn = handler(self,self.onClose);
......@@ -405,6 +406,11 @@ function DecorateView:onClose()
self.runningScene.mask_area_2:setVisible(false);
self.runningScene:showAllDecorate();
self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame());
--返回的时候将游乐场等图标显示出来
self.runningScene.btn_ylc:setVisible(true);
self.runningScene.btn_cwy:setVisible(true);
self.runningScene.btn_grasp:setVisible(true);
self:close();
end
......@@ -416,6 +422,11 @@ function DecorateView:onKeypadBack()
self.runningScene.mask_area_2:setVisible(false);
self.runningScene:showAllDecorate();
self.runningScene.wall:setSpriteFrame(cc.Sprite:create("res/decorate/"..UserModel.wall..".png"):getSpriteFrame());
--返回的时候将游乐场等图标显示出来
self.runningScene.btn_ylc:setVisible(true);
self.runningScene.btn_cwy:setVisible(true);
self.runningScene.btn_grasp:setVisible(true);
self:close();
end
......
......@@ -2,6 +2,8 @@ local FriendView = dialog.uinode("ui/friend/FriendLayer.csb",import(".BaseViewNe
function FriendView:ctor()
FriendView.super.ctor(self);
end
function FriendView:show(uid,user_home)
......@@ -30,6 +32,13 @@ function FriendView:init()
-- SoundManager.playEffect("res/sound/v9shangdianlimai.mp3");
self.runningScene = cc.Director:getInstance():getRunningScene();
if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
self.runningScene.btn_ylc:setVisible(false);
self.runningScene.btn_cwy:setVisible(false);
self.runningScene.btn_grasp:setVisible(false);
end
self.scrollView = self.panel:getChildByName("ScrollView");
self.btn_pre = self.panel:getChildByName("btn_pre");
......@@ -69,7 +78,7 @@ function FriendView:init()
--self.btn_back:getChildByName("selected"):getChildByName("txt"):setString("回家");
self.btn_back:loadTextureNormal("res/ui/friend/bg_friend_back.png");
self.btn_back:loadTexturePressed("res/ui/dress/bg_friend_back.png");
self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame());
--self.btn_back:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/friend/bg_friend_back.png"):getSpriteFrame());
table.sort(game_score,function (aa,bb)
return aa.val1 > bb.val1;
......@@ -535,8 +544,18 @@ function FriendView:onGoHome()
if self.uid ~= UserModel.user_info.uid then
app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.FriendView",user_home=self.user_home});
else
logD("退出朋友界面--------------------------》");
--返回的时候将游乐场等图标显示出来
if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
self.runningScene.btn_ylc:setVisible(true);
self.runningScene.btn_cwy:setVisible(true);
self.runningScene.btn_grasp:setVisible(true);
end
end
self:close();
end
......@@ -547,8 +566,17 @@ function FriendView:onKeypadBack()
if self.uid ~= UserModel.user_info.uid then
app:enterScene("LoadingScene",{nextSceneName="MainScene"});
else
--返回的时候将游乐场等图标显示出来
if self.runningScene.btn_ylc and self.runningScene.btn_cwy and self.runningScene.btn_grasp then
self.runningScene.btn_ylc:setVisible(true);
self.runningScene.btn_cwy:setVisible(true);
self.runningScene.btn_grasp:setVisible(true);
end
end
self:close();
end
......
......@@ -185,7 +185,7 @@ function PetFightView:onNotifyGameEndCallBackFun(params)
cmsg.off("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
local btl = params.data.btl;
app:enterScene("LoadingScene",{nextSceneName="PetPkScene",btl=btl,add_money=params.data.add_money,change_score=params.data.change_score});
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});
end
function PetFightView:onTeamClick()
......
......@@ -12,6 +12,7 @@ function PetPkResultView:show(data,exitFun,againFun)
local win_uid = data.win_uid;
local add_money = data.add_money;
local change_score = data.change_score;
local add_exp=data.add_exp;
local panel = inst:getChildByName("panel");
panel:setScale(0.5);
......@@ -30,14 +31,15 @@ function PetPkResultView:show(data,exitFun,againFun)
inst:getChildByName("panel"):getChildByName("pet_pk_title_win"):setVisible(false);
end
inst:showItems(add_money,change_score);
inst:showItems(add_money,change_score,add_exp);
inst:init();
return inst;
end
function PetPkResultView:showItems(add_money,change_score)
function PetPkResultView:showItems(add_money,change_score,add_exp)
logD("pk战斗得了经验----------------------->"..add_exp);
local items = {};
if add_money > 0 then
items[#items+1] = {id=100001,cnt=add_money};
......@@ -45,6 +47,9 @@ function PetPkResultView:showItems(add_money,change_score)
if change_score ~= 0 then
items[#items+1] = {id=110002,cnt=change_score};
end
if add_exp ~= 0 then
items[#items+1] = {id=100002,cnt=add_exp};
end
local is_shangxian = false; --今日奖励是否达到上限
if #items > 0 then
......@@ -75,6 +80,8 @@ function PetPkResultView:showItems(add_money,change_score)
local info = nil;
if data.id == 110002 then
info = {id=data.id,name="积分"};
elseif data.id==100002 then
info = {id=data.id,name="经验"};
else
info = ItemInfo.getItemInfo(data.id);
end
......@@ -94,6 +101,13 @@ function PetPkResultView:showItems(add_money,change_score)
else
item:getChildByName("vip"):setVisible(false);
end
elseif data.id == 100002 then
local left_vip_day = UserModel.getLeftVipDay();
if left_vip_day > 0 then
item:getChildByName("vip"):setVisible(true);
else
item:getChildByName("vip"):setVisible(false);
end
else
item:getChildByName("vip"):setVisible(false);
end
......
......@@ -101,7 +101,7 @@ function RolePetDetail:init()
local skill_info = PetInfo.get_skill_info(self.pet_info.skillid);
local skill_eff_info = PetInfo.get_skill_eff_info(skill_info.eff);
local eff_name = skill_eff_info.name;
--logD("petDetail-------------------------->"..eff_name);
logD("petDetail-------------------------->"..eff_name);
local xibie = skill_eff_info.xibie;
local zhuangtai = skill_eff_info.zhuangtai;
......@@ -111,10 +111,13 @@ function RolePetDetail:init()
eff_name = string.gsub(eff_name,"i","%%s"); --数字
eff_name = string.gsub(eff_name,"h","%%s"); --系别
eff_name = string.gsub(eff_name,"k","%%s"); --状态
--logD("petDetail22222-------------------------->"..eff_name);
local xibieList={"水","火","草"};
logD("petDetail22222-------------------------->"..eff_name);
local xibieList={"水系","火系","草系",""};
local zhuangtaiList={"嘲讽","护罩","缠绕","冻结","锋利","中毒","血牛"};
--self.pet_info.eff_arr pet表中宠物的eff="1,0,1"
if xibie~=0 then
--logD("petDetail22222-------------------------->"..self.pet_info.eff_arr[tonumber(xibie)]);
self.pet_info.eff_arr[tonumber(xibie)] = xibieList[tonumber(self.pet_info.eff_arr[tonumber(xibie)])];
end
if zhuangtai~=0 then
......@@ -270,7 +273,7 @@ function RolePetDetail:onHome(ref,event)
else
local pos = UserModel.get_empty_pet_pos();
if pos == 0 then
Alert.showOne(strings.msg_1030);
Alert.showOne(strings.msg_1030); --小屋只能摆放5个宠物，你已经摆满了哦
else
LoadingManager.showDataLoading();
delayCall(0.3,function()
......
......@@ -41,7 +41,7 @@ function SignView:init()
else
local sign_reward_str = SignInfo.getSignInfo().reward;
local sign_reward_arr = StringUtil.split(sign_reward_str,",");
self:getChildByName("panel"):getChildByName("txt_vip"):setString("VIP经验+"..sign_reward_arr[2]);
self:getChildByName("panel"):getChildByName("txt_vip"):setString("经验+"..sign_reward_arr[2]);
--self:getChildByName("panel"):getChildByName("pic_vip"):setVisible(false);
end
......
......@@ -77,6 +77,14 @@ function XyxGameOver:onGameEndCallBackFun(params)
else
item:getChildByName("vip"):setVisible(false);
end
elseif data.id == 100002 then
local left_vip_day = UserModel.getLeftVipDay();
if left_vip_day > 0 then
item:getChildByName("vip2"):setVisible(true);
else
item:getChildByName("vip2"):setVisible(false);
end
item:getChildByName("vip"):setVisible(false);
else
item:getChildByName("vip"):setVisible(false);
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 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<Size X="690.0000" Y="251.0000" />
<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">
<Size X="622.0000" Y="226.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="645.0822" Y="557.6517" />
<Position X="642.4974" Y="561.5369" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5040" Y="0.7745" />
<PreSize X="0.5391" Y="0.3486" />
<PrePosition X="0.5020" Y="0.7799" />
<PreSize X="0.4859" Y="0.3139" />
<FileData Type="Normal" Path="common/logo_game.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
......
......@@ -17,19 +17,6 @@
<FileData Type="Normal" Path="decorate/700001.png" Plist="" />
<BlendFunc Src="770" Dst="771" />
</AbstractNodeData>
<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">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint />
<Position X="6.0000" Y="2.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.0047" Y="0.0028" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<Size X="227.0000" Y="299.0000" />
<AnchorPoint />
......@@ -62,6 +49,19 @@
<FileData Type="Normal" Path="ui/decorate/bg_area_2.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint />
<Position X="6.0000" Y="2.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.0047" Y="0.0028" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<Size X="1280.0000" Y="150.0000" />
<Children>
......@@ -549,7 +549,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<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">
<Size X="230.0000" Y="318.0000" />
<Children>
<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 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="321.9816" Y="316.0404" />
<Position X="321.9200" Y="316.0080" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.2515" Y="0.4389" />
......@@ -597,7 +597,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<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">
<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">
<Size X="230.0000" Y="318.0000" />
<Children>
<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 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="892.2384" Y="320.3603" />
<Position X="892.2880" Y="320.3280" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.6971" Y="0.4449" />
......@@ -818,6 +818,19 @@
<FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint />
<Position X="-0.4424" Y="0.0528" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="-0.0003" Y="0.0001" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
......
......@@ -3,16 +3,16 @@
<Item Key="GuidesList">
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="169.7397" />
<Guides Direction="Horizontal" Position="88.0217" />
<Guides Direction="Horizontal" Position="588.8809" />
<Guides Direction="Horizontal" Position="607.6184" />
<Guides Direction="Horizontal" Position="628.9692" />
<Guides Direction="Horizontal" Position="699.6442" />
</HorizontalList>
<VerticalList>
<Guides Position="631.5377" />
<Guides Position="778.7443" />
<Guides Position="1036.5959" />
<Guides Position="97.6776" />
<Guides Position="371.1910" />
<Guides Position="1036.8438" />
</VerticalList>
</Value>
</Item>
......
......@@ -6,10 +6,10 @@
<ObjectData Name="Layer" Tag="145" ctype="GameLayerObjectData">
<Size X="790.0000" Y="506.0000" />
<Children>
<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">
<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">
<Size X="414.0000" Y="486.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="604.3014" Y="243.7908" />
<Position X="604.2710" Y="243.7908" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7649" Y="0.4818" />
......@@ -87,7 +87,7 @@
<PreSize X="0.3430" Y="0.1146" />
<FileData Type="Normal" Path="ui/dress/bg_personal.png" Plist="" />
</AbstractNodeData>
<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">
<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">
<Size X="227.0000" Y="299.0000" />
<AnchorPoint />
<Position X="299.1026" Y="125.7859" />
......@@ -119,10 +119,10 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<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">
<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">
<Size X="112.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="609.9103" Y="451.5921" />
<Position X="609.8800" Y="451.5921" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7720" Y="0.8925" />
......@@ -130,20 +130,20 @@
<FileData Type="Normal" Path="ui/dress/bg_progress_bar.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<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">
<Size X="112.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="611.0162" Y="451.5001" />
<Position X="610.9860" Y="451.5001" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7734" Y="0.8923" />
<PreSize X="0.1418" Y="0.0474" />
<ImageFileData Type="Normal" Path="ui/dress/progress_bar.png" Plist="" />
</AbstractNodeData>
<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">
<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">
<Size X="70.0000" Y="20.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="609.2798" Y="451.8925" />
<Position X="609.2480" Y="451.8925" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7712" Y="0.8931" />
......@@ -151,7 +151,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<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">
<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">
<Size X="605.0000" Y="120.0000" />
<Children>
<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 @@
<FileData Type="Normal" Path="ui/dress/bg_vip_lv.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<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">
<Size X="56.0000" Y="28.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="504.9372" Y="452.4249" />
......
......@@ -369,17 +369,17 @@
<FileData Type="Normal" Path="ui/dress/bg_skill_0.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<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">
<Size X="528.0000" Y="125.0000" />
<Children>
<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">
<Size X="250.0000" Y="80.0000" />
<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">
<Size X="250.0000" Y="180.0000" />
<AnchorPoint ScaleY="0.5000" />
<Position X="123.9532" Y="63.8384" />
<Position X="125.1322" Y="14.3313" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="74" G="74" B="74" />
<PrePosition X="0.2348" Y="0.5107" />
<PreSize X="0.4735" Y="0.6400" />
<PrePosition X="0.2370" Y="0.1147" />
<PreSize X="0.4735" Y="1.4400" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......
......@@ -165,29 +165,6 @@
<PreSize X="0.3889" Y="0.2150" />
<FileData Type="Normal" Path="ui/friend/bg_friend_back_word.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="selected" ActionTag="-971363265" Tag="52" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="108.0000" Y="107.0000" />
<Children>
<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">
<Size X="41.0000" Y="23.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="54.3010" Y="7.2481" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5028" Y="0.0677" />
<PreSize X="0.3796" Y="0.2150" />
<FileData Type="Normal" Path="ui/friend/bg_friend_exit_word.png" Plist="" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="54.0000" Y="53.5000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="ui/friend/bg_friend_back.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="1116.7617" Y="-172.9058" />
......
......@@ -78,7 +78,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<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">
<Size X="620.0000" Y="430.0000" />
<Children>
<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 @@
<FileData Type="Normal" Path="ui/xyx/bg_xyx_head.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<Size X="422.0000" Y="35.0000" />
<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">
<Size X="420.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="313.7667" Y="145.2108" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="0" G="96" B="189" />
<PrePosition X="0.5061" Y="0.3377" />
<PreSize X="0.6806" Y="0.0814" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.6774" Y="0.0698" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......@@ -154,30 +153,28 @@
<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">
<Size X="162.0000" Y="60.0000" />
<Children>
<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">
<Size X="50.0000" Y="28.0000" />
<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">
<Size X="48.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="81.0000" Y="32.1000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="22" G="105" B="0" />
<PrePosition X="0.5000" Y="0.5350" />
<PreSize X="0.3086" Y="0.4667" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.2963" Y="0.4000" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="selected" CanEdit="False" ActionTag="-75842682" VisibleForFrame="False" Tag="1118" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<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">
<Size X="61.0000" Y="35.0000" />
<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">
<Size X="60.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="81.0000" Y="30.0300" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="179" G="61" B="0" />
<PrePosition X="0.5000" Y="0.5005" />
<PreSize X="0.3765" Y="0.5833" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.3704" Y="0.5000" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......@@ -208,30 +205,28 @@
<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">
<Size X="162.0000" Y="60.0000" />
<Children>
<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">
<Size X="98.0000" Y="28.0000" />
<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">
<Size X="96.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="81.0000" Y="32.1000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="22" G="105" B="0" />
<PrePosition X="0.5000" Y="0.5350" />
<PreSize X="0.6049" Y="0.4667" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.5926" Y="0.4000" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="selected" CanEdit="False" ActionTag="202436045" VisibleForFrame="False" Tag="1122" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<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">
<Size X="122.0000" Y="35.0000" />
<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">
<Size X="120.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="81.0000" Y="30.0300" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="179" G="61" B="0" />
<PrePosition X="0.5000" Y="0.5005" />
<PreSize X="0.7531" Y="0.5833" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.7407" Y="0.5000" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......
......@@ -19,7 +19,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<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">
<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">
<Size X="783.0000" Y="516.0000" />
<Children>
<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 @@
<FileData Type="Normal" Path="common/bg_pop_title.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="title_sign" ActionTag="954578371" Tag="124" IconVisible="False" LeftMargin="352.0101" RightMargin="351.9899" TopMargin="39.7318" BottomMargin="438.2682" ctype="SpriteObjectData">
<Size X="79.0000" Y="38.0000" />
<AbstractNodeData Name="title_sign" ActionTag="954578371" Tag="124" IconVisible="False" LeftMargin="351.5101" RightMargin="351.4899" TopMargin="36.7318" BottomMargin="435.2682" ctype="SpriteObjectData">
<Size X="80.0000" Y="44.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="391.5101" Y="457.2682" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.8862" />
<PreSize X="0.1009" Y="0.0736" />
<PreSize X="0.1022" Y="0.0853" />
<FileData Type="Normal" Path="common/title_tishi.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<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">
<Size X="207.0000" Y="207.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="279.2503" Y="228.8543" />
......@@ -65,7 +65,7 @@
<FileData Type="Normal" Path="common/bg_pop_people.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<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">
<Size X="400.0000" Y="80.0000" />
<AnchorPoint ScaleY="0.5000" />
<Position X="191.8883" Y="349.3578" />
......@@ -77,18 +77,18 @@
<OutlineColor A="255" R="0" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<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">
<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">
<Size X="150.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="524.6636" Y="259.1755" />
<Position X="522.6384" Y="244.9795" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="165" B="0" />
<PrePosition X="0.6701" Y="0.5023" />
<PrePosition X="0.6675" Y="0.4748" />
<PreSize X="0.1916" Y="0.0581" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<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">
<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">
<Size X="90.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="493.4213" Y="210.8900" />
......@@ -101,7 +101,7 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="641.1520" Y="359.0000" />
<Position X="641.1520" Y="358.9920" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5009" Y="0.4986" />
......
......@@ -39,7 +39,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="vip" ActionTag="2058042718" Tag="2358" IconVisible="False" LeftMargin="-56.4995" RightMargin="63.4995" TopMargin="-44.9741" BottomMargin="64.9741" ctype="SpriteObjectData">
<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">
<Size X="113.0000" Y="100.0000" />
<Children>
<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 @@
<FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<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">
<Size X="113.0000" Y="100.0000" />
<Children>
<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">
<Size X="80.0000" Y="30.0000" />
<AnchorPoint ScaleY="0.5000" />
<Position X="27.2002" Y="22.7410" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="246" G="121" B="19" />
<PrePosition X="0.2407" Y="0.2274" />
<PreSize X="0.7080" Y="0.3000" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="7.7668" Y="107.4389" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.0647" Y="0.8953" />
<PreSize X="0.9417" Y="0.8333" />
<FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
......
......@@ -28,5 +28,14 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/task/TaskLayer.csd" />
<FilePathData Path="ui/sign/SignLayer.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/sign/SignLayer.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
......@@ -72,6 +72,8 @@ enum USER_EVENT_TYPE
DAILY_EVENT_PLAY_GAME_CNT = 10000022;//每日玩小游戏次数 id:0, data:次数
DAILY_EVENT_PLAY_GAME_PK_CNT = 10000023;//每日玩小游戏pk次数 id:0, data:次数
DAILY_EVENT_PLAY_PK_CNT = 10000024;//每日pk次数 id:0, data:次数
DAILY_EVENT_PK_ADD_EXP_CNT = 10000025;//每日pk获得exp数量 id:0, data:exp获得数量
DAILY_EVENT_END = 19999999;
//----------------------------------------------------------------------------
......@@ -105,7 +107,7 @@ enum USER_EVENT_TYPE
FOREVER_EVENT_IN_ROOM_PET = 40000001;//房间中的宠物,id:位置序号,data:pet id
FOREVER_EVENT_ROLE_WALL = 40000002;//使用的墙,id:0,data:墙纸ID
FOREVER_EVENT_ROLE_CLOTHES = 40000003;//穿上的衣服,id:部位(share_msg.E_USER_BODY_TYPE),data:衣服ID
FOREVER_EVENT_ROLE_LEVEL = 40000004;//等级,id:0,data:经验值
// FOREVER_EVENT_ROLE_LEVEL = 40000004;//等级,id:0,data:经验值
FOREVER_EVENT_ROLE_REWARD = 40000005;//新手礼包,id:0,data:role_reward id, time:领取的时间
FOREVER_EVENT_WX_LOGIN_REWARD = 40000006;//微信登录礼包,id:0,data:1(已领取)
FOREVER_EVENT_FIRST_PAY = 40000007;//首充,id:pay.xml中的id
......@@ -137,6 +139,9 @@ enum USER_EVENT_TYPE
FOREVER_EVENT_GAME_PK_VAL = 40000031;//小游戏PK值 id:0 data:PK值(share_msg::E_GAME_PK_VAL_DEF 初始值代表0)
FOREVER_EVENT_BTL_TEAM_ID = 40000032;//战斗战队 id:0,data:首发队伍ID
FOREVER_EVENT_ACTIVE = 40000033;//活动信息 id:active.xml中的id,data:状态(0:未完成, 1:完成未领取, 2:完成已领取)
FOREVER_EVENT_STATISITCS_FIRST_PAY = 40001001;//统计,第一次充值.id:0,data:0
......@@ -198,6 +203,19 @@ enum E_STATISTICS_TYPE
E_STATISTICS_TYPE_6 = 6;//注册
E_STATISTICS_TYPE_7 = 7;//第一次付费
E_STATISTICS_TYPE_8 = 8;//下线(在线时长-秒)
E_STATISTICS_TYPE_9 = 9;//小游戏次数(游戏ID,难度)
E_STATISTICS_TYPE_10 = 10;//宠物转盘抽奖(抽奖等级)
E_STATISTICS_TYPE_11 = 11;//宠物PK
E_STATISTICS_TYPE_12 = 12;//小游戏好友PK
E_STATISTICS_TYPE_13 = 13;//完成每日任务(任务ID)
E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID)
}
//聊天类型ok
......
......@@ -74,7 +74,7 @@ message login_msg_res
repeated achievement_t achievement = 30;//成就
//optional uint32 pet_btl_cnt = 32;//出战宠物,次数
optional uint32 pet_btl_win_cnt = 33;//出战宠物,胜场
optional uint32 pet_btl_exp = 34;//出战宠物,胜点
optional uint32 pet_btl_exp = 34;//出战宠物,胜点//[废弃]
//optional uint32 pet_btl_time = 35;//可出战宠物,时间
repeated uint32 received_duanwei_lv_reward = 36;//领取过的段位等级奖励
repeated uint32 free_game_id = 37;//可玩的包月小游戏
......@@ -91,6 +91,8 @@ message login_msg_res
optional uint32 pk_win = 48;//pk,胜利次数
optional uint32 pk_val = 49;//pk值
optional uint32 pk_daily_cnt = 50;//每日已pk次数
repeated share_msg.key_val_t active_data = 51;//活动信息 key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
}
message create_role_msg//1,0x00104#创建角色
......@@ -460,7 +462,7 @@ message notify_task_daily_msg//0,0x00501#通知,每日任务
message notify_task_daily_msg_res
{
repeated task_daily_t task_daily = 5;//每日任务（5无意义，只是代表protuf一个唯一的序号标记）
repeated task_daily_t task_daily = 5;//每日任务
}
message get_task_daily_reward_msg//1,0x00502#领取每日任务的奖励
......@@ -483,6 +485,25 @@ message get_task_daily_reward_msg_res
// repeated task_daily_t task_daily = 5;//每日任务
//}
message notify_active_msg//0,0x00504#通知,改变的活动数据
{
}
message notify_active_msg_res
{
repeated share_msg.key_val_t active_data = 1;//活动信息 key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
}
message get_active_reward_msg//1,0x00505#领取活动的奖励
{
optional uint32 id = 1;//活动ID
}
message get_active_reward_msg_res
{
}
////////////////////////////////////////////////
//道具[0x00600,0x006ff]
////////////////////////////////////////////////
......@@ -798,6 +819,7 @@ message notify_game_end_msg_res
optional share_msg.btl_t btl = 2;//战斗数据
optional uint32 add_money = 3;//增加的钱
optional int32 change_score = 4;//积分变化
optional uint32 add_exp = 5;//增加的exp
}
message get_btl_team_msg//1,0x1007#获取战队
......
......@@ -39,9 +39,10 @@ enum E_PLATFORM
E_PLATFORM_XHX_TEST = 100;//测试网络
E_PLATFORM_XHX_WANG_SU = 101;//网宿
E_PLATFORM_XHX_TIANJING_LIANGTONG_TEST = 102;//T天津联通
//E_PLATFORM_XHX_TIANJING_LIANGTONG_TEST = 102;//T天津联通
E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通
E_PLATFORM_XHX_DANG_BEI = 104;//当贝
E_PLATFORM_XHX_DA_TANG = 105;//大唐
......@@ -105,8 +106,9 @@ enum E_PET_BUF{
E_PET_BUF_ADD_ACK_ZHUDONG = 102;//102:增加攻击p1点 主动攻击时候才可用
//[200,300) 范围是被动 添加的 附近影响的buf
E_PET_BUF_NEAR_ADD_ACK = 200;//100:增加攻击p1点
E_PET_BUF_NEAR_ADD_HP = 201;//101:增加hp,p1点
E_PET_BUF_NEAR_ADD_ACK = 200;//增加攻击p1点, 由p3宠物key触发
E_PET_BUF_NEAR_ADD_HP = 201;//增加hp,p1点, 由p3宠物key触发
E_PET_BUF_NEAR_CHAOFENG = 202;//嘲讽, 由p3宠物key触发
}
//通告
......@@ -275,7 +277,7 @@ message pet_btl_buf_update_t
optional int32 time = 3;//有效次数
optional int32 round = 4;//持续回合数
optional int32 param1 = 5;
optional int32 param2 = 6;
optional int32 param2 = 6;//(增加的血量上限)
optional int32 param3 = 7;
}
......@@ -383,6 +385,7 @@ message user_show_t
optional uint32 pk_cnt = 14;//pk次数
optional uint32 pk_win_cnt = 15;//pk获胜次数
optional uint32 pk_val = 16;//PK值
}
//用户显示数据
......
......@@ -37,6 +37,6 @@ BIND_PROTO_CMD_NO_CB(0x10021008,on_update_yesterday_btl_rank_msg,update_yesterda
BIND_PROTO_CMD_NO_CB(0x1002100a,on_delete_yesterday_btl_rank_msg,delete_yesterday_btl_rank_msg);
BIND_PROTO_CMD_NO_CB(0x1002100c,on_delete_user_btl_rank_msg,delete_user_btl_rank_msg);
BIND_PROTO_CMD(0x1002100d,on_random_friend_msg,random_friend_msg);
BIND_PROTO_CMD(0x1002100e,on_check_uid_msg,check_uid_msg);
BIND_PROTO_CMD(0x1002100f,on_check_uid_msg,check_uid_msg);
BIND_PROTO_CMD_NO_CB(0x10021010,on_update_exprie_rank_msg,update_exprie_rank_msg);
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);
BIND_PROTO_CMD(0x0411,on_update_msg,update_msg);
BIND_PROTO_CMD_NO_CB(0x00501,on_notify_task_daily_msg,notify_task_daily_msg);
BIND_PROTO_CMD(0x00502,on_get_task_daily_reward_msg,get_task_daily_reward_msg);
BIND_PROTO_CMD_NO_CB(0x00504,on_notify_active_msg,notify_active_msg);
BIND_PROTO_CMD(0x00505,on_get_active_reward_msg,get_active_reward_msg);
BIND_PROTO_CMD_NO_CB(0x0601,on_notify_item_msg,notify_item_msg);
BIND_PROTO_CMD(0x0602,on_pet_btl_msg,pet_btl_msg);
BIND_PROTO_CMD(0x0603,on_use_item_msg,use_item_msg);
BIND_PROTO_CMD(0x0604,on_pet_eat_msg,pet_eat_msg);
BIND_PROTO_CMD(0x0605,on_pet_sell_msg,pet_sell_msg);
BIND_PROTO_CMD_NO_CB(0x0606,on_notify_item_cnt_max_msg,notify_item_cnt_max_msg);
BIND_PROTO_CMD(0x0607,on_btl_msg,btl_msg);
BIND_PROTO_CMD_NO_CB(0x0608,on_notify_btl_begin_msg,notify_btl_begin_msg);
BIND_PROTO_CMD(0x0609,on_btl_shoot_msg,btl_shoot_msg);
BIND_PROTO_CMD_NO_CB(0x060a,on_notify_btl_ret_msg,notify_btl_ret_msg);
BIND_PROTO_CMD_NO_CB(0x060b,on_notify_btl_end_ret_msg,notify_btl_end_ret_msg);
BIND_PROTO_CMD(0x060c,on_get_duanwei_lv_reward_msg,get_duanwei_lv_reward_msg);
BIND_PROTO_CMD(0x060d,on_get_btl_rank_reward_msg,get_btl_rank_reward_msg);
BIND_PROTO_CMD_NO_CB(0x060e,on_notify_pet_msg,notify_pet_msg);
BIND_PROTO_CMD(0x060f,on_pet_open_skill_msg,pet_open_skill_msg);
BIND_PROTO_CMD(0x00701,on_sign_msg,sign_msg);
BIND_PROTO_CMD(0x00702,on_sign_reward_msg,sign_reward_msg);
BIND_PROTO_CMD(0x00703,on_sign_update_msg,sign_update_msg);
......