Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 32740094 32740094cf42857887cbec5939d3449fd803836a by jinwawa
Options

0517

1 parent f4b4e19e
Expand all
Inline Side-by-side
Showing 54 changed files with 70 additions and 33 deletions
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
34 </platform> 34 </platform>
35 <!--天津--> 35 <!--天津-->
36 <platform id="103,102" channel="cucc"> 36 <platform id="103,102" channel="cucc">
37 <pay id="6" name="10钻石" type="1" extra="0" item="100000,10" rmb="1.0" product="tjlhdcylyac008@201" productPuTao="qjqp006" agentLv="0" notice="0"/> 37 <pay id="6" name="10钻石" type="1" extra="0" item="100000,10" rmb="1.0" product="dclyac001" productPuTao="qjqp006" agentLv="0" notice="0"/>
38 <pay id="7" name="100钻石" type="1" extra="0" item="100000,100" rmb="10.0" product="tjlhdcylyac005@201" productPuTao="qjqp007" agentLv="0" notice="1"/> 38 <pay id="7" name="100钻石" type="1" extra="0" item="100000,100" rmb="10.0" product="dclyac010" productPuTao="qjqp007" agentLv="0" notice="1"/>
39 <pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="tjlhdcylyac198@201" productPuTao="qjqp008" agentLv="0" notice="1"/> 39 <pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="dclyac030" productPuTao="qjqp008" agentLv="0" notice="1"/>
40 <pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="tjlhdcylyby020@201" productPuTao="qjqp009" agentLv="0" notice="1"/> 40 <pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="dclyac050" productPuTao="qjqp009" agentLv="0" notice="1"/>
41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="tjlhdcylyby025@201" productPuTao="qjqp010" agentLv="0" notice="1"/> 41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/>
42 <pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="tjlhdcylyac100@201" productPuTao="qjqp201" notice="1"/> 42 <pay id="201" name="月卡（31天）" type="1" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyby025" productPuTao="qjqp201" notice="1"/>
43 <pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="tjlhdcylyac030@201" productPuTao="qjqp202" notice="1"/> 43 <pay id="202" name="年卡（365天）" type="1" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclyac198" productPuTao="qjqp202" notice="1"/>
44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyac050@201" productPuTao="qjqp999" notice="1"/> 44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020@207" productPuTao="qjqp999" notice="1"/>
45 </platform> 45 </platform>
46 </root> 46 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2082,28 +2082,28 @@ ...@@ -2082,28 +2082,28 @@
2082 reward:升级到该等级,发放的奖励 2082 reward:升级到该等级,发放的奖励
2083 --> 2083 -->
2084 <data lv="0" val="0" name="无" reward=""/> 2084 <data lv="0" val="0" name="无" reward=""/>
2085 <data lv="1" val="1" name="1级见习训宠师" reward="800052,1"/> 2085 <data lv="1" val="1" name="见习训宠师1级" reward="800052,1"/>
2086 <data lv="2" val="10" name="2级见习训宠师" reward="800051,1"/> 2086 <data lv="2" val="10" name="见习训宠师2级" reward="800051,1"/>
2087 <data lv="3" val="20" name="3级见习训宠师" reward="800055,1"/> 2087 <data lv="3" val="20" name="见习训宠师3级" reward="800055,1"/>
2088 <data lv="4" val="40" name="1级新手训宠师" reward="800053,1"/> 2088 <data lv="4" val="40" name="新手训宠师1级" reward="800053,1"/>
2089 <data lv="5" val="60" name="2级新手训宠师" reward="800057,1"/> 2089 <data lv="5" val="60" name="新手训宠师2级" reward="800057,1"/>
2090 <data lv="6" val="80" name="3级新手训宠师" reward="800056,1"/> 2090 <data lv="6" val="80" name="新手训宠师3级" reward="800056,1"/>
2091 <data lv="7" val="110" name="1级初级训宠师" reward="920053,1"/> 2091 <data lv="7" val="110" name="初级训宠师1级" reward="920053,1"/>
2092 <data lv="8" val="140" name="2级初级训宠师" reward="920054,1"/> 2092 <data lv="8" val="140" name="初级训宠师2级" reward="920054,1"/>
2093 <data lv="9" val="180" name="3级初级训宠师" reward="920055,1"/> 2093 <data lv="9" val="180" name="初级训宠师3级" reward="920055,1"/>
2094 <data lv="10" val="220" name="1级中级训宠师" reward="920056,1"/> 2094 <data lv="10" val="220" name="中级训宠师1级" reward="920056,1"/>
2095 <data lv="11" val="260" name="2级中级训宠师" reward="910021,1"/> 2095 <data lv="11" val="260" name="中级训宠师2级" reward="910021,1"/>
2096 <data lv="12" val="300" name="3级中级训宠师" reward="910071,1"/> 2096 <data lv="12" val="300" name="中级训宠师3级" reward="910071,1"/>
2097 <data lv="13" val="350" name="1级高级训宠师" reward="100001,1"/> 2097 <data lv="13" val="350" name="高级训宠师1级" reward="100001,1"/>
2098 <data lv="14" val="400" name="2级高级训宠师" reward="100001,1"/> 2098 <data lv="14" val="400" name="高级训宠师2级" reward="100001,1"/>
2099 <data lv="15" val="450" name="3级高级训宠师" reward="100001,1"/> 2099 <data lv="15" val="450" name="高级训宠师3级" reward="100001,1"/>
2100 <data lv="16" val="500" name="4级高级训宠师" reward="100001,1"/> 2100 <data lv="16" val="500" name="高级训宠师4级" reward="100001,1"/>
2101 <data lv="17" val="550" name="5级高级训宠师" reward="100001,1"/> 2101 <data lv="17" val="550" name="高级训宠师5级" reward="100001,1"/>
2102 <data lv="18" val="600" name="1级导师训宠师" reward="100001,1"/> 2102 <data lv="18" val="600" name="导师训宠师1级" reward="100001,1"/>
2103 <data lv="19" val="650" name="2级导师训宠师" reward="100001,1"/> 2103 <data lv="19" val="650" name="导师训宠师2级" reward="100001,1"/>
2104 <data lv="20" val="700" name="3级导师训宠师" reward="100001,1"/> 2104 <data lv="20" val="700" name="导师训宠师3级" reward="100001,1"/>
2105 <data lv="21" val="750" name="4级导师训宠师" reward="100001,1"/> 2105 <data lv="21" val="750" name="导师训宠师4级" reward="100001,1"/>
2106 <data lv="22" val="800" name="5级导师训宠师" reward="100001,1"/> 2106 <data lv="22" val="800" name="导师训宠师5级" reward="100001,1"/>
2107 2107
2108 </chenghao> 2108 </chenghao>
2109 <eff> 2109 <eff>
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
32 <shop id="1015" buy="200005,1" price="100000,150" des="150钻石" extra="0" /> 32 <shop id="1015" buy="200005,1" price="100000,150" des="150钻石" extra="0" />
33 <shop id="1016" buy="200006,1" price="100000,200" des="200钻石" extra="0" /> 33 <shop id="1016" buy="200006,1" price="100000,200" des="200钻石" extra="0" />
34 34
35 <shop id="1017" buy="300001,1" price="100001,300" des="技能水晶白" extra="0" />
36 <shop id="1018" buy="300002,1" price="100001,500" des="技能水晶绿" extra="0" />
37 <shop id="1019" buy="300003,1" price="100001,1000" des="技能水晶蓝" extra="0" />
38 <shop id="1020" buy="300004,1" price="100001,3000" des="技能水晶紫" extra="0" />
39 <shop id="1021" buy="300005,1" price="100001,10000" des="技能水晶黄" extra="0" />
40 <shop id="1022" buy="300006,1" price="100001,20000" des="技能水晶橙" extra="0" />
41
35 42
36 43
37 44
......

1.66 KB | W: | H:

2.32 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.5 KB | W: | H:

7.14 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -242,7 +242,7 @@ function ShopInfo.getPayInfo(id) ...@@ -242,7 +242,7 @@ function ShopInfo.getPayInfo(id)
242 end 242 end
243 end 243 end
244 if not info then 244 if not info then
245 for i,v in ipairs(vipList) do 245 for i,v in ipairs(vipList) do --月卡
246 if v.id == id then 246 if v.id == id then
247 info = v; 247 info = v;
248 break; 248 break;
......
...@@ -699,9 +699,13 @@ function MainScene:updateSelectedState(near_node, isBounce, is_show_highlight) ...@@ -699,9 +699,13 @@ function MainScene:updateSelectedState(near_node, isBounce, is_show_highlight)
699 for i, v in ipairs(self.nodes) do 699 for i, v in ipairs(self.nodes) do
700 for index, node in ipairs(v) do 700 for index, node in ipairs(v) do
701 local anim = node:getChildByName("anim"); 701 local anim = node:getChildByName("anim");
702 local selectWord=node:getChildByName("select");
702 if anim then 703 if anim then
703 anim:pause(); 704 anim:pause();
704 end 705 end
706 if selectWord then
707 selectWord:setVisible(false);
708 end
705 end 709 end
706 end 710 end
707 711
...@@ -711,6 +715,11 @@ function MainScene:updateSelectedState(near_node, isBounce, is_show_highlight) ...@@ -711,6 +715,11 @@ function MainScene:updateSelectedState(near_node, isBounce, is_show_highlight)
711 anim:getAnimation():play("Animation1"); 715 anim:getAnimation():play("Animation1");
712 end 716 end
713 717
718 local unSelectWord = near_node:getChildByName("select");
719 if unSelectWord then
720 unSelectWord:setVisible(true);
721 end
722
714 MainScene.super.updateSelectedState(self, near_node, isBounce, is_show_highlight); 723 MainScene.super.updateSelectedState(self, near_node, isBounce, is_show_highlight);
715 end 724 end
716 725
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 <Value ctype="GuidesData"> 4 <Value ctype="GuidesData">
5 <HorizontalList> 5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="588.8809" /> 6 <Guides Direction="Horizontal" Position="588.8809" />
7 <Guides Direction="Horizontal" Position="607.6184" />
7 <Guides Direction="Horizontal" Position="628.9692" /> 8 <Guides Direction="Horizontal" Position="628.9692" />
8 <Guides Direction="Horizontal" Position="690.7268" /> 9 <Guides Direction="Horizontal" Position="690.7268" />
9 </HorizontalList> 10 </HorizontalList>
......

1.66 KB | W: | H:

2.32 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.5 KB | W: | H:

7.14 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -530,6 +530,7 @@ ...@@ -530,6 +530,7 @@
530 <Image Name="arrow.png" /> 530 <Image Name="arrow.png" />
531 <Image Name="bg_area_1.png" /> 531 <Image Name="bg_area_1.png" />
532 <Image Name="bg_area_2.png" /> 532 <Image Name="bg_area_2.png" />
533 <Image Name="bg_decorate_mask.png" />
533 <Image Name="bg_item.png" /> 534 <Image Name="bg_item.png" />
534 <Image Name="bg_item_tab_1.png" /> 535 <Image Name="bg_item_tab_1.png" />
535 <Image Name="bg_item_tab_2.png" /> 536 <Image Name="bg_item_tab_2.png" />
...@@ -763,6 +764,26 @@ ...@@ -763,6 +764,26 @@
763 <Image Name="img_red_point.png" /> 764 <Image Name="img_red_point.png" />
764 <Image Name="tips_new_activity_title.png" /> 765 <Image Name="tips_new_activity_title.png" />
765 <Image Name="tips_new_game_title.png" /> 766 <Image Name="tips_new_game_title.png" />
767 <Image Name="wird_pet_grasp.png" />
768 <Image Name="wird_pet_pk_01.png" />
769 <Image Name="word_achievement.png" />
770 <Image Name="word_achievement_1.png" />
771 <Image Name="word_activity.png" />
772 <Image Name="word_activity_01.png" />
773 <Image Name="word_decorate.png" />
774 <Image Name="word_decorate_1.png" />
775 <Image Name="word_friend.png" />
776 <Image Name="word_friend_01.png" />
777 <Image Name="word_get.png" />
778 <Image Name="word_get_1.png" />
779 <Image Name="word_grasp_1.png" />
780 <Image Name="word_pet_pk_1.png" />
781 <Image Name="word_shop.png" />
782 <Image Name="word_shop_01.png" />
783 <Image Name="word_task_1.png" />
784 <Image Name="word_task.png" />
785 <Image Name="word_ylc.png" />
786 <Image Name="word_ylc_1.png" />
766 </Folder> 787 </Folder>
767 <Folder Name="medal"> 788 <Folder Name="medal">
768 <Image Name="medal_600001.png" /> 789 <Image Name="medal_600001.png" />
......
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
32 <Value ctype="TabsInfo"> 32 <Value ctype="TabsInfo">
33 <OpenedDocuments> 33 <OpenedDocuments>
34 <FilePathData Path="ui/MainScene.csd" /> 34 <FilePathData Path="ui/MainScene.csd" />
35 <FilePathData Path="ui/pet/PetStarTurnSelecteView.csd" />
36 </OpenedDocuments> 35 </OpenedDocuments>
37 <ActiveDocument Path="ui/pet/PetStarTurnSelecteView.csd" /> 36 <ActiveDocument Path="ui/MainScene.csd" />
38 </Value> 37 </Value>
39 </Item> 38 </Item>
40 </Properties> 39 </Properties>
......