Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3d0bb0dc 3d0bb0dc871b2433c22058e430d2293fe16ed4b1 by jinwawa
Options

0624

1 parent 19110c18
Inline Side-by-side
Showing 20 changed files with 162 additions and 218 deletions
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/> 55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
56 </type> 56 </type>
57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数"> 57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
58 <reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/> 58 <reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
59 <reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/> 59 <reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
60 <reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/> 60 <reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
61 </type> 61 </type>
62 62
63 <level id="1" cnt="2" item="100001,200"/> 63 <level id="1" cnt="2" item="100001,200"/>
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/> 55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
56 </type> 56 </type>
57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数"> 57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
58 <reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/> 58 <reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
59 <reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/> 59 <reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
60 <reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/> 60 <reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
61 </type> 61 </type>
62 62
63 <level id="1" cnt="2" item="100001,200"/> 63 <level id="1" cnt="2" item="100001,200"/>
......
...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip ...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip 2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0 3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0
4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0 4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
5 100002 vip经验 vip经验 2 0 0 0 0 0 0 0 5 100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
6 100003 花 花 2 0 0 0 0 0 0 0 6 100003 花 花 2 0 0 0 0 0 0 0
7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0 7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0 8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
No preview for this file type
...@@ -43,4 +43,11 @@ ...@@ -43,4 +43,11 @@
43 <pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/> 43 <pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/> 44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
45 </platform> 45 </platform>
46 <!--上海电信-->
47 <platform id="106" channel="shdx">
48 <pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" payitem="" rmb="69.0" product="1000710508" productPuTao="qjqp201" notice="1"/>
49 <pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="299.0" product="1000710226" productPuTao="qjqp202" notice="1"/>
50 <pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" payitem="" rmb="49.0" product="1000709506" productPuTao="qjqp999" notice="1"/>
51 </platform>
52
46 </root> 53 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2290,9 +2290,13 @@ ...@@ -2290,9 +2290,13 @@
2290 <body id="7" data="800057,800107,800127,800207,800217,800227"/> 2290 <body id="7" data="800057,800107,800127,800207,800217,800227"/>
2291 2291
2292 <!-- 自动战斗对手 2292 <!-- 自动战斗对手
2293 pk_val表示玩家pk积分在以下范围内时会匹配到该等级的机器人
2294 petstar中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的星级要比玩家随机一个宠物大2。
2295 lv中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的等级要比玩家随机一个宠物大2。
2296 skill中的数字表示AI宠物的技能开启和玩家的差异。“1”代表需要比玩家多1个宠物开启了技能。
2293 --> 2297 -->
2294 2298
2295 <user id="1001" name="对手1001" pk_val="500"> 2299 <user id="1001" name="对手1001" pk_val="500" petstar="0,0" lv="0,0" skill="0">
2296 <!-- 2300 <!--
2297 id//id 2301 id//id
2298 lv//等级 2302 lv//等级
...@@ -2362,7 +2366,7 @@ ...@@ -2362,7 +2366,7 @@
2362 2366
2363 </user> 2367 </user>
2364 2368
2365 <user id="1002" name="对手1002" pk_val="1000"> 2369 <user id="1002" name="对手1002" pk_val="1000" petstar="0,0" lv="0,0" skill="1">
2366 <!-- 2370 <!--
2367 id//id 2371 id//id
2368 lv//等级 2372 lv//等级
...@@ -2464,7 +2468,7 @@ ...@@ -2464,7 +2468,7 @@
2464 2468
2465 </user> 2469 </user>
2466 2470
2467 <user id="1003" name="对手1003" pk_val="2000"> 2471 <user id="1003" name="对手1003" pk_val="2000" petstar="0,0" lv="1,1" skill="1">
2468 <!-- 2472 <!--
2469 id//id 2473 id//id
2470 lv//等级 2474 lv//等级
...@@ -2613,7 +2617,7 @@ ...@@ -2613,7 +2617,7 @@
2613 2617
2614 </user> 2618 </user>
2615 2619
2616 <user id="1004" name="对手1004" pk_val="9999999"> 2620 <user id="1004" name="对手1004" pk_val="9999999" petstar="1,1" lv="1,1" skill="1">
2617 <!-- 2621 <!--
2618 id//id 2622 id//id
2619 lv//等级 2623 lv//等级
......
...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip ...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip 2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0 3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0
4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0 4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
5 100002 vip经验 vip经验 2 0 0 0 0 0 0 0 5 100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
6 100003 花 花 2 0 0 0 0 0 0 0 6 100003 花 花 2 0 0 0 0 0 0 0
7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0 7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0 8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
No preview for this file type
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800279afc6e</Account> 6 <Account>m0800279afc6c09</Account>
7 <exp>0</exp> 7 <exp>0</exp>
8 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
9 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
29 <uid>1030100010142906</uid> 29 <uid>1030100010142923</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/> 55 <reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
56 </type> 56 </type>
57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数"> 57 <type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
58 <reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/> 58 <reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
59 <reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/> 59 <reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
60 <reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/> 60 <reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
61 </type> 61 </type>
62 62
63 <level id="1" cnt="2" item="100001,200"/> 63 <level id="1" cnt="2" item="100001,200"/>
......
...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip ...@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip 2 物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0 3 100000 钻石 商店里购买 0 0 0 0 0 0 0 0
4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0 4 100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
5 100002 vip经验 vip经验 2 0 0 0 0 0 0 0 5 100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
6 100003 花 花 2 0 0 0 0 0 0 0 6 100003 花 花 2 0 0 0 0 0 0 0
7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0 7 200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0 8 200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
...@@ -100,13 +100,24 @@ end ...@@ -100,13 +100,24 @@ end
100 100
101 function ActivityVipView:update(_is_init) 101 function ActivityVipView:update(_is_init)
102 local vipList = ShopInfo.getVipList(); 102 local vipList = ShopInfo.getVipList();
103 local flag=0; --是否订购了会员及是否领取了奖励，0，未订购，1订购，2未领取，3已领取
103 104
104 local _nodes = { }; 105 local _nodes = { };
105 106
106 -- 包月 107 -- 包月
107 local vipInfo1 = vipList[1]; 108 local vipInfo1 = vipList[1];
109 local data1 = UserModel.getVipByID(vipInfo1.id);
110 --包年
111 local vipInfo2 = vipList[2];
112 local data2 = UserModel.getVipByID(vipInfo2.id);
108 -- 连续包月 113 -- 连续包月
109 local vipInfo3 = vipList[3]; 114 local vipInfo3 = vipList[3];
115 local data3 = UserModel.getVipByID(vipInfo3.id); --包年礼包详情
116
117 --会员生效，可能是包月、续包月或包年会员之一
118 if (data1 and data1.val2 >= UserModel.time_second) or (data2 and data2.val2 >= UserModel.time_second) or (data3 and data3.val2 >= UserModel.time_second) then
119 flag=2;
120 end
110 121
111 local itemList1 = vipInfo1.itemList; 122 local itemList1 = vipInfo1.itemList;
112 for i = 1, 2 do 123 for i = 1, 2 do
...@@ -139,6 +150,7 @@ function ActivityVipView:update(_is_init) ...@@ -139,6 +150,7 @@ function ActivityVipView:update(_is_init)
139 local data1 = UserModel.getVipByID(vipInfo1.id); 150 local data1 = UserModel.getVipByID(vipInfo1.id);
140 if data1 and data1.val2 >= UserModel.time_second then 151 if data1 and data1.val2 >= UserModel.time_second then
141 if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then--单包月礼包详情 152 if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then--单包月礼包详情
153 flag=3;
142 -- 可领取 154 -- 可领取
143 local day = math.floor((data1.val2 - UserModel.time_second) /(24 * 3600)) + 1; 155 local day = math.floor((data1.val2 - UserModel.time_second) /(24 * 3600)) + 1;
144 if data1.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data1.val1) then 156 if data1.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data1.val1) then
...@@ -153,10 +165,11 @@ function ActivityVipView:update(_is_init) ...@@ -153,10 +165,11 @@ function ActivityVipView:update(_is_init)
153 _nodes[1] = { self.btn_lingqu_month }; 165 _nodes[1] = { self.btn_lingqu_month };
154 else 166 else
155 -- 已领取 167 -- 已领取
168 flag=4;
156 self.btn_lingqu_month:setVisible(false); 169 self.btn_lingqu_month:setVisible(false);
157 self.yilingqu_month:setVisible(true); 170 self.yilingqu_month:setVisible(true);
158 end 171 end
159 else 172 elseif flag==0 then
160 self.btn_vip_month:setVisible(true); --显示包月按钮 173 self.btn_vip_month:setVisible(true); --显示包月按钮
161 _nodes[1] = { self.btn_vip_month }; 174 _nodes[1] = { self.btn_vip_month };
162 --[[elseif not has_vip_month then --这里需要改 175 --[[elseif not has_vip_month then --这里需要改
...@@ -174,16 +187,22 @@ function ActivityVipView:update(_is_init) ...@@ -174,16 +187,22 @@ function ActivityVipView:update(_is_init)
174 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then 187 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
175 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then 188 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
176 -- 可领取 189 -- 可领取
190 if flag==0 then --只有包月未赋值情况下才弄它
191 flag=3;
192 end
177 self.btn_lingqu_month:setVisible(true); 193 self.btn_lingqu_month:setVisible(true);
178 self.btn_lingqu_month.id = vipInfo3.id; 194 self.btn_lingqu_month.id = vipInfo3.id;
179 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久"); 195 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
180 _nodes[1] = { self.btn_lingqu_month }; 196 _nodes[1] = { self.btn_lingqu_month };
181 else 197 else
182 -- 已领取 198 -- 已领取
199 if flag==0 then --只有包月未赋值情况下才弄它
200 flag=4;
201 end
183 self.btn_lingqu_month:setVisible(false); 202 self.btn_lingqu_month:setVisible(false);
184 self.yilingqu_month:setVisible(true); 203 self.yilingqu_month:setVisible(true);
185 end 204 end
186 else --显示续包月按钮 205 elseif flag==0 then --显示续包月按钮
187 self.btn_vip_lianxu:setVisible(true); 206 self.btn_vip_lianxu:setVisible(true);
188 if #_nodes > 0 then 207 if #_nodes > 0 then
189 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu; 208 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
...@@ -208,7 +227,7 @@ function ActivityVipView:update(_is_init) ...@@ -208,7 +227,7 @@ function ActivityVipView:update(_is_init)
208 end--]] 227 end--]]
209 228
210 -- 包年 229 -- 包年
211 local vipInfo2 = vipList[2]; 230
212 local itemList2 = vipInfo2.itemList; 231 local itemList2 = vipInfo2.itemList;
213 for i = 1, 3 do 232 for i = 1, 3 do
214 local item = self:getChildByName("y_item_" .. i); 233 local item = self:getChildByName("y_item_" .. i);
...@@ -229,6 +248,9 @@ function ActivityVipView:update(_is_init) ...@@ -229,6 +248,9 @@ function ActivityVipView:update(_is_init)
229 if data and data.val2 >= UserModel.time_second then 248 if data and data.val2 >= UserModel.time_second then
230 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then 249 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
231 -- 可领取 250 -- 可领取
251 if flag==0 then --只有包月，续包月未赋值情况下才弄它
252 flag=3;
253 end
232 local day = math.floor((data.val2 - UserModel.time_second) /(24 * 3600)) + 1; 254 local day = math.floor((data.val2 - UserModel.time_second) /(24 * 3600)) + 1;
233 if data.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data.val1) then 255 if data.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data.val1) then
234 day = day - 1; 256 day = day - 1;
...@@ -244,10 +266,13 @@ function ActivityVipView:update(_is_init) ...@@ -244,10 +266,13 @@ function ActivityVipView:update(_is_init)
244 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year; 266 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;
245 else 267 else
246 -- 已领取 268 -- 已领取
269 if flag==0 then --只有包月，续包月未赋值情况下才弄它
270 flag=4;
271 end
247 self.btn_lingqu_year:setVisible(false); 272 self.btn_lingqu_year:setVisible(false);
248 self.yilingqu_year:setVisible(true); 273 self.yilingqu_year:setVisible(true);
249 end 274 end
250 else 275 elseif flag==0 then
251 self.btn_vip_year:setVisible(true); 276 self.btn_vip_year:setVisible(true);
252 if not _nodes[1] then 277 if not _nodes[1] then
253 _nodes[1] = { }; 278 _nodes[1] = { };
...@@ -258,9 +283,40 @@ function ActivityVipView:update(_is_init) ...@@ -258,9 +283,40 @@ function ActivityVipView:update(_is_init)
258 if not _is_init and self.update_nodes_func then 283 if not _is_init and self.update_nodes_func then
259 self.update_nodes_func(_nodes); 284 self.update_nodes_func(_nodes);
260 end 285 end
286
287 --[[if flag==0 then
288 self.btn_vip_year:setVisible(true); --包年
289 self.btn_vip_month:setVisible(true); --包月
290 self.btn_vip_lianxu:setVisible(true); --续包月
291 else
292 self.btn_vip_year:setVisible(false); --包年
293 self.btn_vip_month:setVisible(false); --包月
294 self.btn_vip_lianxu:setVisible(false); --续包月
295 --table:remove(self.btn_vip_year);
296 --table:remove(self.btn_vip_month);
297 --table:remove(self.btn_vip_lianxu);
298 end--]]
299
300
261 return _nodes; 301 return _nodes;
262 end 302 end
263 303
304 -- 删除table表中符合conditionFunc的数据
305 -- @param tb 要删除数据的table
306 -- @param conditionFunc 符合要删除的数据的条件函数
307 function removeTableData(tb, conditionFunc)
308 -- body
309 if tb ~= nil and next(tb) ~= nil then
310 -- todo
311 for i = #tb, 1, -1 do
312 if conditionFunc(tb[i]) then
313 -- todo
314 table.remove(tb, i)
315 end
316 end
317 end
318 end
319
264 function ActivityVipView:onGetClick(ref) 320 function ActivityVipView:onGetClick(ref)
265 local reciever = require("app.views.view.XyxPayView_shdx"):show(); 321 local reciever = require("app.views.view.XyxPayView_shdx"):show();
266 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 322 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -13,13 +13,6 @@ function ActivityVipView:init() ...@@ -13,13 +13,6 @@ function ActivityVipView:init()
13 local vipList = ShopInfo.getVipList(); 13 local vipList = ShopInfo.getVipList();
14 -- （月卡，包年卡，包月卡） 14 -- （月卡，包年卡，包月卡）
15 15
16 self.btn_vip_year = self:getChildByName("btn_vip_year");
17 self.btn_vip_year.id = vipList[2].id;
18 self.btn_vip_year.fn = function()
19 self:onGetClick(self.btn_vip_year);
20 end
21 self.btn_vip_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetClick)) end);
22
23 self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu"); 16 self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
24 logD("vipList[3]--------------------->" .. #vipList); 17 logD("vipList[3]--------------------->" .. #vipList);
25 if vipList[3] then 18 if vipList[3] then
...@@ -37,27 +30,16 @@ function ActivityVipView:init() ...@@ -37,27 +30,16 @@ function ActivityVipView:init()
37 end 30 end
38 self.btn_lingqu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end); 31 self.btn_lingqu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
39 32
40 self.btn_lingqu_year = self:getChildByName("btn_lingqu_year");
41 self.btn_lingqu_year.id = vipList[2].id;
42 self.btn_lingqu_year.fn = function()
43 self:onLingquClick(self.btn_lingqu_year);
44 end
45 self.btn_lingqu_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
46
47 self.yilingqu_month = self:getChildByName("yilingqu_month"); 33 self.yilingqu_month = self:getChildByName("yilingqu_month");
48 self.yilingqu_month:setVisible(false); 34 self.yilingqu_month:setVisible(false);
49 self.yilingqu_year = self:getChildByName("yilingqu_year");
50 self.yilingqu_year:setVisible(false);
51 35
52 EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate)); 36 EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
53 37
54 UmengHelper.onEvent("activity_vip_show"); 38 UmengHelper.onEvent("activity_vip_show");
55 39
56 self.yilingqu_month:setVisible(false); 40 self.yilingqu_month:setVisible(false);
57 self.yilingqu_year:setVisible(false);
58 self.btn_lingqu_month:setVisible(false); 41 self.btn_lingqu_month:setVisible(false);
59 self.btn_vip_year:setVisible(false); 42 self.btn_vip_lianxu:setVisible(false);
60 self.btn_lingqu_year:setVisible(false);
61 local function authCallbackLua(result) 43 local function authCallbackLua(result)
62 -- 去鉴权看看有没有订购连续包月 44 -- 去鉴权看看有没有订购连续包月
63 self.orderStaus = result; 45 self.orderStaus = result;
...@@ -131,7 +113,7 @@ function ActivityVipView:update(_is_init) ...@@ -131,7 +113,7 @@ function ActivityVipView:update(_is_init)
131 end 113 end
132 114
133 local has_vip_month = false; 115 local has_vip_month = false;
134 local data1 = UserModel.getVipByID(vipInfo1.id); 116 --[[local data1 = UserModel.getVipByID(vipInfo1.id); --没有包月
135 if data1 and data1.val2 >= UserModel.time_second then 117 if data1 and data1.val2 >= UserModel.time_second then
136 has_vip_month = true; 118 has_vip_month = true;
137 elseif vipInfo3 then 119 elseif vipInfo3 then
...@@ -170,14 +152,14 @@ function ActivityVipView:update(_is_init) ...@@ -170,14 +152,14 @@ function ActivityVipView:update(_is_init)
170 -- self.btn_vip_month_single:setVisible(true); 152 -- self.btn_vip_month_single:setVisible(true);
171 -- _nodes[1] = { self.btn_vip_month_single }; 153 -- _nodes[1] = { self.btn_vip_month_single };
172 end 154 end
173 end 155 end--]]
174 156
175 if vipInfo3 then 157 if vipInfo3 then
176 local data3 = UserModel.getVipByID(vipInfo3.id); 158 local data3 = UserModel.getVipByID(vipInfo3.id);
177 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then 159 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
178 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then 160 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
179 -- 可领取 161 -- 可领取
180 -- self.btn_lingqu_month:setVisible(true); 162 self.btn_lingqu_month:setVisible(true);
181 self.btn_lingqu_month.id = vipInfo3.id; 163 self.btn_lingqu_month.id = vipInfo3.id;
182 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久"); 164 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
183 _nodes[1] = { self.btn_lingqu_month }; 165 _nodes[1] = { self.btn_lingqu_month };
...@@ -186,23 +168,23 @@ function ActivityVipView:update(_is_init) ...@@ -186,23 +168,23 @@ function ActivityVipView:update(_is_init)
186 self.btn_lingqu_month:setVisible(false); 168 self.btn_lingqu_month:setVisible(false);
187 self.yilingqu_month:setVisible(true); 169 self.yilingqu_month:setVisible(true);
188 end 170 end
189 elseif not has_vip_month then 171 else
190 --[[self.btn_vip_lianxu:setVisible(true); 172 self.btn_vip_lianxu:setVisible(true);
191 if #_nodes > 0 then 173 if #_nodes > 0 then
192 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu; 174 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
193 else 175 else
194 _nodes[1] = {self.btn_vip_lianxu}; 176 _nodes[1] = {self.btn_vip_lianxu};
195 end--]] 177 end
196 end 178 end
197 end 179 end
198 180
199 if #_nodes > 0 then 181 --[[if #_nodes > 0 then
200 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu; 182 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
201 else 183 else
202 _nodes[1] = { self.btn_vip_lianxu }; 184 _nodes[1] = { self.btn_vip_lianxu };
203 end 185 end--]]
204 186
205 -- 包年 187 -- 包年,没有包年
206 local vipInfo2 = vipList[2]; 188 local vipInfo2 = vipList[2];
207 local itemList2 = vipInfo2.itemList; 189 local itemList2 = vipInfo2.itemList;
208 --[[for i = 1, 3 do 190 --[[for i = 1, 3 do
...@@ -220,7 +202,7 @@ function ActivityVipView:update(_is_init) ...@@ -220,7 +202,7 @@ function ActivityVipView:update(_is_init)
220 item:setVisible(false); 202 item:setVisible(false);
221 end 203 end
222 end--]] 204 end--]]
223 local data = UserModel.getVipByID(vipInfo2.id); 205 --[[local data = UserModel.getVipByID(vipInfo2.id);
224 if data and data.val2 >= UserModel.time_second then 206 if data and data.val2 >= UserModel.time_second then
225 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then 207 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
226 -- 可领取 208 -- 可领取
...@@ -231,23 +213,23 @@ function ActivityVipView:update(_is_init) ...@@ -231,23 +213,23 @@ function ActivityVipView:update(_is_init)
231 if day < 0 then 213 if day < 0 then
232 day = 0; 214 day = 0;
233 end 215 end
234 --[[self.btn_lingqu_year:setVisible(true); 216 self.btn_lingqu_year:setVisible(true);
235 self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)"); 217 self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)");
236 if not _nodes[1] then 218 if not _nodes[1] then
237 _nodes[1] = { }; 219 _nodes[1] = { };
238 end 220 end
239 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;--]] 221 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;
240 else 222 else
241 -- 已领取 223 -- 已领取
242 --self.yilingqu_year:setVisible(true); 224 --self.yilingqu_year:setVisible(true);
243 end 225 end
244 else 226 else
245 --[[self.btn_vip_year:setVisible(true); 227 self.btn_vip_year:setVisible(true);
246 if not _nodes[1] then 228 if not _nodes[1] then
247 _nodes[1] = { }; 229 _nodes[1] = { };
248 end 230 end
249 _nodes[1][#_nodes[1] + 1] = self.btn_vip_year;--]] 231 _nodes[1][#_nodes[1] + 1] = self.btn_vip_year;
250 end 232 end--]]
251 233
252 if not _is_init and self.update_nodes_func then 234 if not _is_init and self.update_nodes_func then
253 self.update_nodes_func(_nodes); 235 self.update_nodes_func(_nodes);
......
...@@ -228,8 +228,13 @@ function RoleBussinessView:onWxClick(ref) ...@@ -228,8 +228,13 @@ function RoleBussinessView:onWxClick(ref)
228 end 228 end
229 229
230 function RoleBussinessView:onVipClick(ref) 230 function RoleBussinessView:onVipClick(ref)
231 if CHANNEL=="shdx" then
232 local reciever = require("app.views.view.XyxPayView_shdx"):show();
233 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
234 else
231 local reciever = require("app.views.view.ActivityView"):show("ActivityVipView"); 235 local reciever = require("app.views.view.ActivityView"):show("ActivityVipView");
232 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 236 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
237 end
233 end 238 end
234 239
235 function RoleBussinessView:onGetClick(ref) 240 function RoleBussinessView:onGetClick(ref)
......
...@@ -3,8 +3,8 @@ cc.FileUtils:getInstance():setPopupNotify(false) ...@@ -3,8 +3,8 @@ cc.FileUtils:getInstance():setPopupNotify(false)
3 cc.FileUtils:getInstance():addSearchPath("src/") 3 cc.FileUtils:getInstance():addSearchPath("src/")
4 cc.FileUtils:getInstance():addSearchPath("res/") 4 cc.FileUtils:getInstance():addSearchPath("res/")
5 5
6 local engine_loaded = {}; 6 local engine_loaded = { };
7 for i,v in pairs(package.loaded) do 7 for i, v in pairs(package.loaded) do
8 engine_loaded[i] = v; 8 engine_loaded[i] = v;
9 end 9 end
10 10
...@@ -27,8 +27,10 @@ local function main() ...@@ -27,8 +27,10 @@ local function main()
27 PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr"); 27 PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
28 PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr"); 28 PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
29 IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv")); 29 IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
30 MEMBER_TYPE=0; --会员类型，0:不是会员, 其他对应pay.xml中的pay_id 30 MEMBER_TYPE = 0;
31 IS_MEMBER=0; --是不是会员 0：不是会员 31 -- 会员类型，0:不是会员, 其他对应pay.xml中的pay_id
32 IS_MEMBER = 0;
33 -- 是不是会员 0：不是会员
32 34
33 require "core.log.init"; 35 require "core.log.init";
34 require "core.net.socket_connection"; 36 require "core.net.socket_connection";
...@@ -40,31 +42,32 @@ local function main() ...@@ -40,31 +42,32 @@ local function main()
40 CDN_CONFIG_URL = ConfigInfo.getConfigInfo("cdn_config_url") or ""; 42 CDN_CONFIG_URL = ConfigInfo.getConfigInfo("cdn_config_url") or "";
41 if not CDN_CONFIG_URL or CDN_CONFIG_URL == "" then 43 if not CDN_CONFIG_URL or CDN_CONFIG_URL == "" then
42 GAME_LOGIN_URL = ConfigInfo.getConfigInfo("game_login_url"); 44 GAME_LOGIN_URL = ConfigInfo.getConfigInfo("game_login_url");
43 print("本地配置 登录服务器地址："..GAME_LOGIN_URL); 45 print("本地配置 登录服务器地址：" .. GAME_LOGIN_URL);
44 PLATFORM = tonumber(ConfigInfo.getConfigInfo("platform")); 46 PLATFORM = tonumber(ConfigInfo.getConfigInfo("platform"));
45 print("本地配置 平台号PLATFORM:"..PLATFORM); 47 print("本地配置 平台号PLATFORM:" .. PLATFORM);
46 end 48 end
47 49
48 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then 50 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
49 self:isMember(); 51 self:isMember();
50 end 52 end
51 53
52 cc.Director:getInstance():setAnimationInterval(1/30); 54 cc.Director:getInstance():setAnimationInterval(1 / 30);
53 require("app.MyApp"):create():run("LoadingScene"); 55 require("app.MyApp"):create():run("LoadingScene");
54 end 56 end
55 57
56 --判断是不是会员 58 -- 判断是不是会员
57 function isMember() 59 function isMember()
58 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 60 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
59 local function callbackLua(params) 61 local function callbackLua(params)
60 logUI("IS MEMEBER---->"..params); 62 logUI("IS MEMEBER---->" .. params);
61 if params=="success" then 63 if params == "success" then
62 IS_MEMBER=1; 64 IS_MEMBER = 1;
63 else 65 else
64 IS_MEMBER=0; 66 IS_MEMBER = 0;
65 end 67 end
66 end 68 end
67 local luaj = require "cocos.cocos2d.luaj"; --引入luaj 69 local luaj = require "cocos.cocos2d.luaj";
70 -- 引入luaj
68 local className = "org/cocos2dx/lua/AppActivity"; 71 local className = "org/cocos2dx/lua/AppActivity";
69 local args = { callbackLua }; 72 local args = { callbackLua };
70 local sigs = "(I)V"; 73 local sigs = "(I)V";
...@@ -82,15 +85,15 @@ function isMember() ...@@ -82,15 +85,15 @@ function isMember()
82 end 85 end
83 86
84 function reloadGame() 87 function reloadGame()
85 for k,_ in pairs(package.loaded) do 88 for k, _ in pairs(package.loaded) do
86 local has_k = false; 89 local has_k = false;
87 for i,v in pairs(engine_loaded) do 90 for i, v in pairs(engine_loaded) do
88 if k == i then 91 if k == i then
89 has_k = true; 92 has_k = true;
90 end 93 end
91 end 94 end
92 if not has_k then 95 if not has_k then
93 print("remove:"..k); 96 print("remove:" .. k);
94 package.loaded[k] = nil; 97 package.loaded[k] = nil;
95 end 98 end
96 end 99 end
...@@ -103,22 +106,22 @@ end ...@@ -103,22 +106,22 @@ end
103 106
104 function loadGame(game_name) 107 function loadGame(game_name)
105 local searchPaths = cc.FileUtils:getInstance():getSearchPaths(); 108 local searchPaths = cc.FileUtils:getInstance():getSearchPaths();
106 local resPath = cc.FileUtils:getInstance():getWritablePath().."GameUpdate/"..game_name.."/"; 109 local resPath = cc.FileUtils:getInstance():getWritablePath() .. "GameUpdate/" .. game_name .. "/";
107 searchPaths = {}; 110 searchPaths = { };
108 table.insert(searchPaths,1,resPath); 111 table.insert(searchPaths, 1, resPath);
109 table.insert(searchPaths,2,resPath .. 'res/'); 112 table.insert(searchPaths, 2, resPath .. 'res/');
110 table.insert(searchPaths,3,resPath .. 'src/'); 113 table.insert(searchPaths, 3, resPath .. 'src/');
111 cc.FileUtils:getInstance():setSearchPaths(searchPaths); 114 cc.FileUtils:getInstance():setSearchPaths(searchPaths);
112 115
113 for k,_ in pairs(package.loaded) do 116 for k, _ in pairs(package.loaded) do
114 local has_k = false; 117 local has_k = false;
115 for i,v in pairs(engine_loaded) do 118 for i, v in pairs(engine_loaded) do
116 if k == i then 119 if k == i then
117 has_k = true; 120 has_k = true;
118 end 121 end
119 end 122 end
120 if not has_k then 123 if not has_k then
121 print("remove:"..k); 124 print("remove:" .. k);
122 package.loaded[k] = nil; 125 package.loaded[k] = nil;
123 end 126 end
124 end 127 end
...@@ -126,7 +129,7 @@ function loadGame(game_name) ...@@ -126,7 +129,7 @@ function loadGame(game_name)
126 cc.FileUtils:getInstance():purgeCachedEntries(); 129 cc.FileUtils:getInstance():purgeCachedEntries();
127 cc.Director:getInstance():purgeCachedData(); 130 cc.Director:getInstance():purgeCachedData();
128 131
129 app:enterScene("LoadingScene",{nextSceneName="main"}); 132 app:enterScene("LoadingScene", { nextSceneName = "main" });
130 end 133 end
131 134
132 local status, msg = xpcall(main, __G__TRACKBACK__) 135 local status, msg = xpcall(main, __G__TRACKBACK__)
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
16 <PreSize X="1.3815" Y="1.1945" /> 16 <PreSize X="1.3815" Y="1.1945" />
17 <FileData Type="Normal" Path="common/bg_huodong.png" Plist="" /> 17 <FileData Type="Normal" Path="common/bg_huodong.png" Plist="" />
18 </AbstractNodeData> 18 </AbstractNodeData>
19 <AbstractNodeData Name="bg_title" ActionTag="255349692" Tag="2177" IconVisible="False" LeftMargin="34.6646" RightMargin="166.3354" TopMargin="-68.0567" BottomMargin="530.0567" LeftEage="200" RightEage="200" TopEage="29" BottomEage="29" Scale9OriginX="200" Scale9OriginY="29" Scale9Width="209" Scale9Height="30" ctype="ImageViewObjectData"> 19 <AbstractNodeData Name="bg_title" ActionTag="255349692" Tag="2177" IconVisible="False" LeftMargin="34.6649" RightMargin="166.3351" TopMargin="-54.0571" BottomMargin="516.0571" LeftEage="200" RightEage="200" TopEage="29" BottomEage="29" Scale9OriginX="200" Scale9OriginY="29" Scale9Width="209" Scale9Height="30" ctype="ImageViewObjectData">
20 <Size X="609.0000" Y="88.0000" /> 20 <Size X="609.0000" Y="88.0000" />
21 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 21 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
22 <Position X="339.1646" Y="574.0567" /> 22 <Position X="339.1649" Y="560.0571" />
23 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 23 <Scale ScaleX="1.0000" ScaleY="1.0000" />
24 <CColor A="255" R="255" G="255" B="255" /> 24 <CColor A="255" R="255" G="255" B="255" />
25 <PrePosition X="0.4187" Y="1.0437" /> 25 <PrePosition X="0.4187" Y="1.0183" />
26 <PreSize X="0.7519" Y="0.1600" /> 26 <PreSize X="0.7519" Y="0.1600" />
27 <FileData Type="Normal" Path="common/bg_app_title02.png" Plist="" /> 27 <FileData Type="Normal" Path="common/bg_app_title02.png" Plist="" />
28 </AbstractNodeData> 28 </AbstractNodeData>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <PreSize X="0.1235" Y="0.0764" /> 36 <PreSize X="0.1235" Y="0.0764" />
37 <FileData Type="Normal" Path="common/title_activity.png" Plist="" /> 37 <FileData Type="Normal" Path="common/title_activity.png" Plist="" />
38 </AbstractNodeData> 38 </AbstractNodeData>
39 <AbstractNodeData Name="bg_activity_vip" ActionTag="-750140484" Tag="332" IconVisible="False" LeftMargin="-120.0042" RightMargin="-63.9957" TopMargin="28.9576" BottomMargin="-40.9576" ctype="SpriteObjectData"> 39 <AbstractNodeData Name="bg_activity_vip" ActionTag="-750140484" Tag="332" IconVisible="False" LeftMargin="-120.0042" RightMargin="-63.9958" TopMargin="28.9576" BottomMargin="-40.9576" ctype="SpriteObjectData">
40 <Size X="994.0000" Y="562.0000" /> 40 <Size X="994.0000" Y="562.0000" />
41 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 41 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
42 <Position X="376.9958" Y="240.0424" /> 42 <Position X="376.9958" Y="240.0424" />
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 <PreSize X="0.8012" Y="0.3527" /> 77 <PreSize X="0.8012" Y="0.3527" />
78 <FileData Type="Normal" Path="ui/Activity/tianjin_cucc/title_activity.png" Plist="" /> 78 <FileData Type="Normal" Path="ui/Activity/tianjin_cucc/title_activity.png" Plist="" />
79 </AbstractNodeData> 79 </AbstractNodeData>
80 <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2777" RightMargin="336.7223" TopMargin="500.3858" BottomMargin="-10.3858" 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"> 80 <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2830" RightMargin="336.7170" TopMargin="500.3858" BottomMargin="-10.3858" 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">
81 <Size X="162.0000" Y="60.0000" /> 81 <Size X="162.0000" Y="60.0000" />
82 <Children> 82 <Children>
83 <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-1.1016" RightMargin="1.1016" TopMargin="0.0180" BottomMargin="-0.0180" ctype="SpriteObjectData"> 83 <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-1.1016" RightMargin="1.1016" TopMargin="0.0180" BottomMargin="-0.0180" ctype="SpriteObjectData">
...@@ -103,9 +103,19 @@ ...@@ -103,9 +103,19 @@
103 <OutlineColor A="255" R="255" G="0" B="0" /> 103 <OutlineColor A="255" R="255" G="0" B="0" />
104 <ShadowColor A="255" R="110" G="110" B="110" /> 104 <ShadowColor A="255" R="110" G="110" B="110" />
105 </AbstractNodeData> 105 </AbstractNodeData>
106 <AbstractNodeData Name="icon_renew" ActionTag="-126285829" Tag="45" IconVisible="False" LeftMargin="100.0386" RightMargin="-5.0386" TopMargin="-9.3816" BottomMargin="45.3816" LeftEage="22" RightEage="22" TopEage="7" BottomEage="7" Scale9OriginX="22" Scale9OriginY="7" Scale9Width="23" Scale9Height="10" ctype="ImageViewObjectData">
107 <Size X="67.0000" Y="24.0000" />
108 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
109 <Position X="133.5386" Y="57.3816" />
110 <Scale ScaleX="1.0000" ScaleY="1.0000" />
111 <CColor A="255" R="255" G="255" B="255" />
112 <PrePosition X="0.8243" Y="0.9564" />
113 <PreSize X="0.4136" Y="0.4000" />
114 <FileData Type="Normal" Path="ui/Activity/activity_renew.png" Plist="" />
115 </AbstractNodeData>
106 </Children> 116 </Children>
107 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 117 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
108 <Position X="392.2777" Y="19.6142" /> 118 <Position X="392.2830" Y="19.6142" />
109 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 119 <Scale ScaleX="1.0000" ScaleY="1.0000" />
110 <CColor A="255" R="255" G="255" B="255" /> 120 <CColor A="255" R="255" G="255" B="255" />
111 <PrePosition X="0.4843" Y="0.0357" /> 121 <PrePosition X="0.4843" Y="0.0357" />
...@@ -117,17 +127,7 @@ ...@@ -117,17 +127,7 @@
117 <OutlineColor A="255" R="255" G="0" B="0" /> 127 <OutlineColor A="255" R="255" G="0" B="0" />
118 <ShadowColor A="255" R="110" G="110" B="110" /> 128 <ShadowColor A="255" R="110" G="110" B="110" />
119 </AbstractNodeData> 129 </AbstractNodeData>
120 <AbstractNodeData Name="icon_renew" ActionTag="-126285829" Tag="45" IconVisible="False" LeftMargin="413.8210" RightMargin="329.1790" TopMargin="493.4732" BottomMargin="32.5268" LeftEage="22" RightEage="22" TopEage="7" BottomEage="7" Scale9OriginX="22" Scale9OriginY="7" Scale9Width="23" Scale9Height="10" ctype="ImageViewObjectData"> 130 <AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="310.1406" RightMargin="337.8594" TopMargin="500.3862" BottomMargin="-10.3862" 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">
121 <Size X="67.0000" Y="24.0000" />
122 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
123 <Position X="447.3210" Y="44.5268" />
124 <Scale ScaleX="1.0000" ScaleY="1.0000" />
125 <CColor A="255" R="255" G="255" B="255" />
126 <PrePosition X="0.5522" Y="0.0810" />
127 <PreSize X="0.0827" Y="0.0436" />
128 <FileData Type="Normal" Path="ui/Activity/activity_renew.png" Plist="" />
129 </AbstractNodeData>
130 <AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="57.2852" RightMargin="590.7148" TopMargin="495.1287" BottomMargin="-5.1287" 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">
131 <Size X="162.0000" Y="60.0000" /> 131 <Size X="162.0000" Y="60.0000" />
132 <Children> 132 <Children>
133 <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 133 <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -165,122 +165,10 @@ ...@@ -165,122 +165,10 @@
165 </AbstractNodeData> 165 </AbstractNodeData>
166 </Children> 166 </Children>
167 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 167 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
168 <Position X="138.2852" Y="24.8713" /> 168 <Position X="391.1406" Y="19.6138" />
169 <Scale ScaleX="1.0000" ScaleY="1.0000" />
170 <CColor A="255" R="255" G="255" B="255" />
171 <PrePosition X="0.1707" Y="0.0452" />
172 <PreSize X="0.2000" Y="0.1091" />
173 <TextColor A="255" R="65" G="65" B="70" />
174 <DisabledFileData Type="Default" Path="Default/Button_Disable.png" Plist="" />
175 <PressedFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
176 <NormalFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
177 <OutlineColor A="255" R="255" G="0" B="0" />
178 <ShadowColor A="255" R="110" G="110" B="110" />
179 </AbstractNodeData>
180 <AbstractNodeData Name="yilingqu_month" Visible="False" ActionTag="-1665006638" Tag="245" IconVisible="False" LeftMargin="81.3665" RightMargin="612.6335" TopMargin="487.3489" BottomMargin="-11.3489" ctype="SpriteObjectData">
181 <Size X="116.0000" Y="74.0000" />
182 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
183 <Position X="139.3665" Y="25.6511" />
184 <Scale ScaleX="1.0000" ScaleY="1.0000" />
185 <CColor A="255" R="255" G="255" B="255" />
186 <PrePosition X="0.1721" Y="0.0466" />
187 <PreSize X="0.1432" Y="0.1345" />
188 <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
189 <BlendFunc Src="1" Dst="771" />
190 </AbstractNodeData>
191 <AbstractNodeData Name="btn_vip_year" ActionTag="1349290642" VisibleForFrame="False" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="539.6220" RightMargin="108.3780" TopMargin="494.3176" BottomMargin="-4.3176" 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">
192 <Size X="162.0000" Y="60.0000" />
193 <Children>
194 <AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-226.4436" RightMargin="226.4436" TopMargin="-3.2460" BottomMargin="3.2460" ctype="SpriteObjectData">
195 <Size X="162.0000" Y="60.0000" />
196 <AnchorPoint ScaleX="0.4999" ScaleY="0.5779" />
197 <Position X="-145.4592" Y="37.9222" />
198 <Scale ScaleX="1.0000" ScaleY="1.0000" />
199 <CColor A="255" R="255" G="255" B="255" />
200 <PrePosition X="-0.8979" Y="0.6320" />
201 <PreSize X="1.0000" Y="1.0000" />
202 <FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
203 <BlendFunc Src="1" Dst="771" />
204 </AbstractNodeData>
205 <AbstractNodeData Name="Text_102" ActionTag="-1496397639" Tag="983" IconVisible="False" LeftMargin="20.6549" RightMargin="21.3451" TopMargin="13.6017" BottomMargin="15.3983" FontSize="26" LabelText="198元包年" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
206 <Size X="120.0000" Y="31.0000" />
207 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
208 <Position X="80.6549" Y="30.8983" />
209 <Scale ScaleX="1.0000" ScaleY="1.0000" />
210 <CColor A="255" R="165" G="42" B="42" />
211 <PrePosition X="0.4979" Y="0.5150" />
212 <PreSize X="0.7407" Y="0.5167" />
213 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
214 <OutlineColor A="255" R="255" G="0" B="0" />
215 <ShadowColor A="255" R="110" G="110" B="110" />
216 </AbstractNodeData>
217 <AbstractNodeData Name="Text_103" Visible="False" ActionTag="900644303" VisibleForFrame="False" Tag="984" IconVisible="False" LeftMargin="17.7905" RightMargin="14.2095" TopMargin="31.6245" BottomMargin="8.3755" FontSize="20" LabelText="（剩余300天）" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
218 <Size X="130.0000" Y="20.0000" />
219 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
220 <Position X="82.7905" Y="18.3755" />
221 <Scale ScaleX="1.0000" ScaleY="1.0000" />
222 <CColor A="255" R="165" G="42" B="42" />
223 <PrePosition X="0.5111" Y="0.3063" />
224 <PreSize X="0.8025" Y="0.3333" />
225 <OutlineColor A="255" R="255" G="0" B="0" />
226 <ShadowColor A="255" R="110" G="110" B="110" />
227 </AbstractNodeData>
228 </Children>
229 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
230 <Position X="620.6220" Y="25.6824" />
231 <Scale ScaleX="1.0000" ScaleY="1.0000" />
232 <CColor A="255" R="255" G="255" B="255" />
233 <PrePosition X="0.7662" Y="0.0467" />
234 <PreSize X="0.2000" Y="0.1091" />
235 <TextColor A="255" R="65" G="65" B="70" />
236 <DisabledFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
237 <PressedFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
238 <NormalFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
239 <OutlineColor A="255" R="255" G="0" B="0" />
240 <ShadowColor A="255" R="110" G="110" B="110" />
241 </AbstractNodeData>
242 <AbstractNodeData Name="btn_lingqu_year" Visible="False" ActionTag="408602144" Tag="243" IconVisible="False" LeftMargin="536.9364" RightMargin="111.0636" TopMargin="495.3234" BottomMargin="-5.3234" 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">
243 <Size X="162.0000" Y="60.0000" />
244 <Children>
245 <AbstractNodeData Name="selected" Visible="False" ActionTag="1452305529" Tag="202" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
246 <Size X="162.0000" Y="60.0000" />
247 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
248 <Position X="81.0000" Y="30.0000" />
249 <Scale ScaleX="1.0000" ScaleY="1.0000" />
250 <CColor A="255" R="255" G="255" B="255" />
251 <PrePosition X="0.5000" Y="0.5000" />
252 <PreSize X="1.0000" Y="1.0000" />
253 <FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
254 <BlendFunc Src="1" Dst="771" />
255 </AbstractNodeData>
256 <AbstractNodeData Name="Image_2" ActionTag="-1065554251" Tag="44" IconVisible="False" LeftMargin="6.2166" RightMargin="89.7834" TopMargin="2.0000" BottomMargin="4.0000" LeftEage="21" RightEage="21" TopEage="17" BottomEage="17" Scale9OriginX="21" Scale9OriginY="17" Scale9Width="24" Scale9Height="20" ctype="ImageViewObjectData">
257 <Size X="66.0000" Y="54.0000" />
258 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
259 <Position X="39.2166" Y="31.0000" />
260 <Scale ScaleX="0.6667" ScaleY="0.6667" />
261 <CColor A="255" R="255" G="255" B="255" />
262 <PrePosition X="0.2421" Y="0.5167" />
263 <PreSize X="0.4074" Y="0.9000" />
264 <FileData Type="Normal" Path="ui/Activity/activity_gift_icon.png" Plist="" />
265 </AbstractNodeData>
266 <AbstractNodeData Name="txt" ActionTag="1626546622" Tag="244" IconVisible="False" LeftMargin="70.2168" RightMargin="8.7832" TopMargin="16.7121" BottomMargin="19.2879" FontSize="20" LabelText="领取礼包" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
267 <Size X="83.0000" Y="24.0000" />
268 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
269 <Position X="111.7168" Y="31.2879" />
270 <Scale ScaleX="1.0000" ScaleY="1.0000" />
271 <CColor A="255" R="190" G="86" B="10" />
272 <PrePosition X="0.6896" Y="0.5215" />
273 <PreSize X="0.5123" Y="0.4000" />
274 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
275 <OutlineColor A="255" R="255" G="0" B="0" />
276 <ShadowColor A="255" R="110" G="110" B="110" />
277 </AbstractNodeData>
278 </Children>
279 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
280 <Position X="617.9364" Y="24.6766" />
281 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 169 <Scale ScaleX="1.0000" ScaleY="1.0000" />
282 <CColor A="255" R="255" G="255" B="255" /> 170 <CColor A="255" R="255" G="255" B="255" />
283 <PrePosition X="0.7629" Y="0.0449" /> 171 <PrePosition X="0.4829" Y="0.0357" />
284 <PreSize X="0.2000" Y="0.1091" /> 172 <PreSize X="0.2000" Y="0.1091" />
285 <TextColor A="255" R="65" G="65" B="70" /> 173 <TextColor A="255" R="65" G="65" B="70" />
286 <DisabledFileData Type="Default" Path="Default/Button_Disable.png" Plist="" /> 174 <DisabledFileData Type="Default" Path="Default/Button_Disable.png" Plist="" />
...@@ -289,13 +177,13 @@ ...@@ -289,13 +177,13 @@
289 <OutlineColor A="255" R="255" G="0" B="0" /> 177 <OutlineColor A="255" R="255" G="0" B="0" />
290 <ShadowColor A="255" R="110" G="110" B="110" /> 178 <ShadowColor A="255" R="110" G="110" B="110" />
291 </AbstractNodeData> 179 </AbstractNodeData>
292 <AbstractNodeData Name="yilingqu_year" Visible="False" ActionTag="-1866334125" Tag="246" IconVisible="False" LeftMargin="559.6356" RightMargin="134.3644" TopMargin="487.5239" BottomMargin="-11.5239" ctype="SpriteObjectData"> 180 <AbstractNodeData Name="yilingqu_month" Visible="False" ActionTag="-1665006638" Tag="245" IconVisible="False" LeftMargin="330.8696" RightMargin="363.1304" TopMargin="490.2706" BottomMargin="-14.2706" ctype="SpriteObjectData">
293 <Size X="116.0000" Y="74.0000" /> 181 <Size X="116.0000" Y="74.0000" />
294 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 182 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
295 <Position X="617.6356" Y="25.4761" /> 183 <Position X="388.8696" Y="22.7294" />
296 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 184 <Scale ScaleX="1.0000" ScaleY="1.0000" />
297 <CColor A="255" R="255" G="255" B="255" /> 185 <CColor A="255" R="255" G="255" B="255" />
298 <PrePosition X="0.7625" Y="0.0463" /> 186 <PrePosition X="0.4801" Y="0.0413" />
299 <PreSize X="0.1432" Y="0.1345" /> 187 <PreSize X="0.1432" Y="0.1345" />
300 <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" /> 188 <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
301 <BlendFunc Src="1" Dst="771" /> 189 <BlendFunc Src="1" Dst="771" />
......
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
34 <FilePathData Path="ui/dress/BusinessView.csd" /> 34 <FilePathData Path="ui/dress/BusinessView.csd" />
35 <FilePathData Path="ui/dress/DressLayer.csd" /> 35 <FilePathData Path="ui/dress/DressLayer.csd" />
36 <FilePathData Path="ui/achievement/AchievementItem.csd" /> 36 <FilePathData Path="ui/achievement/AchievementItem.csd" />
37 <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" /> 37 <FilePathData Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
38 <FilePathData Path="ui/Activity/shanghai_ctcc/ActivityVip.csd" />
39 </OpenedDocuments> 38 </OpenedDocuments>
40 <ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" /> 39 <ActiveDocument Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
41 </Value> 40 </Value>
42 </Item> 41 </Item>
43 </Properties> 42 </Properties>
......