Commit 7a449072 7a4490724dc0af5937df4b41d285f67c3efda8b5 by jinwawa

0514

1 parent d2bd6394
Showing 43 changed files with 114 additions and 70 deletions
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
320 <lv id="9" ack="2" def="9" ai="90" /> 320 <lv id="9" ack="2" def="9" ai="90" />
321 <lv id="10" ack="2" def="9" ai="95" /> 321 <lv id="10" ack="2" def="9" ai="95" />
322 </pet> 322 </pet>
323 <pet id="10026" name="小丑鱼" attr="1" star="3" skillid="4003" eff="1" animationTime="0" animationID="1004" scale="1" des="小丑鱼,因为脸上都有一条或两条白色条纹,好似京剧中的丑角而得名,是一种热带咸水鱼。小丑鱼与海葵有着密不可分的共生关系,因此又称海葵鱼。栖息于珊瑚礁与岩礁。" py="xiǎo chǒu yú "> 323 <pet id="10026" name="小丑鱼" attr="1" star="3" skillid="4004" eff="1" animationTime="0" animationID="1004" scale="1" des="小丑鱼,因为脸上都有一条或两条白色条纹,好似京剧中的丑角而得名,是一种热带咸水鱼。小丑鱼与海葵有着密不可分的共生关系,因此又称海葵鱼。栖息于珊瑚礁与岩礁。" py="xiǎo chǒu yú ">
324 <lv id="1" ack="2" def="8" ai="10" /> 324 <lv id="1" ack="2" def="8" ai="10" />
325 <lv id="2" ack="2" def="8" ai="20" /> 325 <lv id="2" ack="2" def="8" ai="20" />
326 <lv id="3" ack="2" def="8" ai="30" /> 326 <lv id="3" ack="2" def="8" ai="30" />
...@@ -1244,7 +1244,7 @@ ...@@ -1244,7 +1244,7 @@
1244 <lv id="9" ack="5" def="12" ai="90" /> 1244 <lv id="9" ack="5" def="12" ai="90" />
1245 <lv id="10" ack="5" def="12" ai="95" /> 1245 <lv id="10" ack="5" def="12" ai="95" />
1246 </pet> 1246 </pet>
1247 <pet id="20045" name="大熊猫" attr="2" star="3" py="dà xióng māo" skillid="4003" eff="1" animationTime="0" animationID="1005" scale="1.1" des="大熊猫,在地球上生存了800万年,被誉为“活化石”和“中国国宝”,是中国特有物种。靠吃竹子为生,食物营养低劣,不能有过多的能量贮存。为了保存能量,必须控制能量消耗过大的活动,行动缓慢。视觉极不发达。"> 1247 <pet id="20045" name="大熊猫" attr="2" star="3" py="dà xióng māo" skillid="4004" eff="1" animationTime="0" animationID="1005" scale="1.1" des="大熊猫,在地球上生存了800万年,被誉为“活化石”和“中国国宝”,是中国特有物种。靠吃竹子为生,食物营养低劣,不能有过多的能量贮存。为了保存能量,必须控制能量消耗过大的活动,行动缓慢。视觉极不发达。">
1248 <lv id="1" ack="2" def="8" ai="10" /> 1248 <lv id="1" ack="2" def="8" ai="10" />
1249 <lv id="2" ack="2" def="8" ai="20" /> 1249 <lv id="2" ack="2" def="8" ai="20" />
1250 <lv id="3" ack="2" def="8" ai="30" /> 1250 <lv id="3" ack="2" def="8" ai="30" />
......
1 xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y 1 xcopy %cd%\res D:\AndroidProject\XhxAndroid_ws\assets\res /E/I/Y
2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd 2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_ws\assets\src -e -k tpdrawgdanjue -b tpdrawgd
3 xcopy %cd%\src D:\AndroidProject\XhxAndroid_ws\assets\src /E/I/Y 3
......
1 <!-- edited with XMLSpy v2013 (http://www.altova.com) by () -->
2 <root>
3 <!--活动 收集宠物
4 id:序号
5 item:奖励的物品
6 beginTime:开始时间
7 endTime:结束时间
8 needPet:需要宠物
9 -->
10 <!--2018-12-24 00:00:00-->
11 <data id="1" beginTime="1555948800" endTime="1903104000" needPet="10001,10002,10003" item="200001,1;300001,1"/>
12 <!--2019-02-01 00:00:00-->
13 <data id="2" beginTime="1555948800" endTime="1903104000" needPet="10004,10005,10006" item="200001,2;300001,2" />
14 <!--2019-03-01 00:00:00-->
15 <data id="3" beginTime="1555948800" endTime="1903104000" needPet="10007,10008,10009" item="200001,3;300001,2"/>
16 <!--2019-04-01 00:00:00 -->
17 <data id="4" beginTime="1555948800" endTime="1903104000" needPet="10010,10011,10012" item="200001,4;300001,3"/>
18 </root>
19
No preview for this file type
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
320 <lv id="9" ack="2" def="9" ai="90" /> 320 <lv id="9" ack="2" def="9" ai="90" />
321 <lv id="10" ack="2" def="9" ai="95" /> 321 <lv id="10" ack="2" def="9" ai="95" />
322 </pet> 322 </pet>
323 <pet id="10026" name="小丑鱼" attr="1" star="3" skillid="4003" eff="1" animationTime="0" animationID="1004" scale="1" des="小丑鱼,因为脸上都有一条或两条白色条纹,好似京剧中的丑角而得名,是一种热带咸水鱼。小丑鱼与海葵有着密不可分的共生关系,因此又称海葵鱼。栖息于珊瑚礁与岩礁。" py="xiǎo chǒu yú "> 323 <pet id="10026" name="小丑鱼" attr="1" star="3" skillid="4004" eff="1" animationTime="0" animationID="1004" scale="1" des="小丑鱼,因为脸上都有一条或两条白色条纹,好似京剧中的丑角而得名,是一种热带咸水鱼。小丑鱼与海葵有着密不可分的共生关系,因此又称海葵鱼。栖息于珊瑚礁与岩礁。" py="xiǎo chǒu yú ">
324 <lv id="1" ack="2" def="8" ai="10" /> 324 <lv id="1" ack="2" def="8" ai="10" />
325 <lv id="2" ack="2" def="8" ai="20" /> 325 <lv id="2" ack="2" def="8" ai="20" />
326 <lv id="3" ack="2" def="8" ai="30" /> 326 <lv id="3" ack="2" def="8" ai="30" />
...@@ -1244,7 +1244,7 @@ ...@@ -1244,7 +1244,7 @@
1244 <lv id="9" ack="5" def="12" ai="90" /> 1244 <lv id="9" ack="5" def="12" ai="90" />
1245 <lv id="10" ack="5" def="12" ai="95" /> 1245 <lv id="10" ack="5" def="12" ai="95" />
1246 </pet> 1246 </pet>
1247 <pet id="20045" name="大熊猫" attr="2" star="3" py="dà xióng māo" skillid="4003" eff="1" animationTime="0" animationID="1005" scale="1.1" des="大熊猫,在地球上生存了800万年,被誉为“活化石”和“中国国宝”,是中国特有物种。靠吃竹子为生,食物营养低劣,不能有过多的能量贮存。为了保存能量,必须控制能量消耗过大的活动,行动缓慢。视觉极不发达。"> 1247 <pet id="20045" name="大熊猫" attr="2" star="3" py="dà xióng māo" skillid="4004" eff="1" animationTime="0" animationID="1005" scale="1.1" des="大熊猫,在地球上生存了800万年,被誉为“活化石”和“中国国宝”,是中国特有物种。靠吃竹子为生,食物营养低劣,不能有过多的能量贮存。为了保存能量,必须控制能量消耗过大的活动,行动缓慢。视觉极不发达。">
1248 <lv id="1" ack="2" def="8" ai="10" /> 1248 <lv id="1" ack="2" def="8" ai="10" />
1249 <lv id="2" ack="2" def="8" ai="20" /> 1249 <lv id="2" ack="2" def="8" ai="20" />
1250 <lv id="3" ack="2" def="8" ai="30" /> 1250 <lv id="3" ack="2" def="8" ai="30" />
......
...@@ -10,32 +10,32 @@ ...@@ -10,32 +10,32 @@
10 show:显示的个数(总数20个) 10 show:显示的个数(总数20个)
11 pr:抽中的概率(百分比) 11 pr:抽中的概率(百分比)
12 --> 12 -->
13 <reward id="1" show="20" pr="100"/> 13 <reward id="1" show="16" pr="100"/>
14 </star> 14 </star>
15 <star id="2"> 15 <star id="2">
16 <reward id="1" show="8" pr="60"/> 16 <reward id="1" show="4" pr="60"/>
17 <reward id="2" show="12" pr="40"/> 17 <reward id="2" show="12" pr="40"/>
18 18
19 </star> 19 </star>
20 <star id="3"> 20 <star id="3">
21 <reward id="2" show="10" pr="65"/> 21 <reward id="2" show="6" pr="65"/>
22 <reward id="3" show="10" pr="35"/> 22 <reward id="3" show="10" pr="35"/>
23 23
24 24
25 </star> 25 </star>
26 <star id="4"> 26 <star id="4">
27 <reward id="2" show="6" pr="50"/> 27 <reward id="2" show="4" pr="50"/>
28 <reward id="3" show="6" pr="30"/> 28 <reward id="3" show="4" pr="30"/>
29 <reward id="4" show="8" pr="20"/> 29 <reward id="4" show="8" pr="20"/>
30 </star> 30 </star>
31 <star id="5"> 31 <star id="5">
32 <reward id="3" show="6" pr="50"/> 32 <reward id="3" show="6" pr="50"/>
33 <reward id="4" show="8" pr="30"/> 33 <reward id="4" show="6" pr="30"/>
34 <reward id="5" show="6" pr="20"/> 34 <reward id="5" show="4" pr="20"/>
35 </star> 35 </star>
36 <star id="6"> 36 <star id="6">
37 <reward id="4" show="6" pr="50"/> 37 <reward id="4" show="5" pr="50"/>
38 <reward id="5" show="8" pr="30"/> 38 <reward id="5" show="7" pr="30"/>
39 <reward id="6" show="6" pr="20"/> 39 <reward id="6" show="4" pr="20"/>
40 </star> 40 </star>
41 </root> 41 </root>
......
1 id reward 1 id reward
2 第几天 奖励的道具 2 ڼ ĵ
3 1 800035,1 3 1 800035,1
4 2 800034,1 4 2 800034,1
5 3 800032,1 5 3 800032,1
......
1 level score add_item add_vip 1 level score add_item add_vip
2 等级 积分 vip游戏金币加成 vip游戏用户经验加成 2 等级 积分 vip游戏金币加成 vip游戏用户经验加成
3 1 0 1.1 1.2 3 1 0 1.1 1.2
4 2 40 1.2 1.2 4 2 40 1.2 1.2
5 3 120 1.3 1.2 5 3 120 1.3 1.2
......
No preview for this file type
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
10 10
11 2018-12-01 00:00:00 11 2018-12-01 00:00:00
12 <data id="1" beginTime="1543593600" endTime="1546272000" item1="100000,330" item2="100002,330;100001,100" item1Name="冰雪奇缘套装"/> 12 <data id="1" beginTime="1543593600" endTime="1546272000" item1="100000,330" item2="100002,330;100001,100" item1Name="冰雪奇缘套装"/>
13 1559811492
14 1548950399
15 1551369599
16 --> 13 -->
17 <!--2018-12-24 00:00:00--> 14 <!--2018-12-24 00:00:00-->
18 <data id="2" type="2" beginTime="1545580800" endTime="1548950399" item1="800122,1;800123,1;800124,1;800125,1;800127,1" item2="100000,50;200001,5" item1Name="海盗船长套装"/> 15 <data id="2" type="2" beginTime="1545580800" endTime="1548950399" item1="800122,1;800123,1;800124,1;800125,1;800127,1" item2="100000,50;200001,5" item1Name="海盗船长套装"/>
......
1 
2 btl_cnt_reward 新手对局福利
3 create_reward 新手创建礼包
4
5 game 每日上限最大值、救济金
6 game_birds 飞禽走兽配置表
7 game_fruit_machine 水果机配置表
8 game_score 积分产出
9 gd_charm ——————
10 gd_score 积分称号
11 head 头像、头像框对应魅力值、积分
12 item 物品
13 lobby_room_cfg 游戏房间的配置:底分、门票、进入房间限制、机器人携带钱数、输赢封顶倍数
14 login 登陆大转盘中,连续登录几天的奖励
15 mail 邮件配置,战况、周活动奖励、更新版本奖励等
16 nick 昵称随机
17 niuniu 牛牛:抢庄、押注
18 notice 公告
19 online_reward 每日在线礼包
20 pay 支付购买相关:商城点券、充值活动
21 rank_exprie_reward 周赛活动排行榜 名次 奖励
22 rank_yesterday_reward 排行榜 昨天名次 奖励
23 role_reward 登陆1-7天,奖励的道具
24 rules 掼蛋单机规则提示
25 shop 商城出售
26 shop_medal 勋章产出游戏、上限
27 sign ——————
28 task_daily 每日任务
29 turntable 登陆大转盘中,抽奖
30 xx_lobby_room_cfg 开房房卡消耗
31 achievement 成就
...\ No newline at end of file ...\ No newline at end of file

4.89 KB | W: | H:

2.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.26 KB | W: | H:

2.01 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.15 KB | W: | H:

3.18 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.95 KB | W: | H:

3.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -365,10 +365,10 @@ function PetPkScene:show_round_ack_my(round_ack_data,index,btl_round_data) ...@@ -365,10 +365,10 @@ function PetPkScene:show_round_ack_my(round_ack_data,index,btl_round_data)
365 self:update_pet_pos(); 365 self:update_pet_pos();
366 elseif _has_pet_die then 366 elseif _has_pet_die then
367 --出击过程中,有宠物死了,等待1秒时间宠物播放死亡动画,宠物归位 367 --出击过程中,有宠物死了,等待1秒时间宠物播放死亡动画,宠物归位
368 item_1:runAction(cc.Sequence:create(cc.DelayTime:create(1),cc.MoveTo:create(0.5,item_1_world_pos),cc.CallFunc:create(item_move_back_complete))); 368 item_1:runAction(cc.Sequence:create(cc.DelayTime:create(1),cc.MoveTo:create(0.2,item_1_world_pos),cc.CallFunc:create(item_move_back_complete)));
369 else 369 else
370 --出击的宠物延时归位 370 --出击的宠物延时归位
371 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.5,item_1_world_pos),cc.CallFunc:create(item_move_back_complete))); 371 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.2,item_1_world_pos),cc.CallFunc:create(item_move_back_complete)));
372 end 372 end
373 end 373 end
374 374
...@@ -416,7 +416,7 @@ function PetPkScene:show_round_ack_my(round_ack_data,index,btl_round_data) ...@@ -416,7 +416,7 @@ function PetPkScene:show_round_ack_my(round_ack_data,index,btl_round_data)
416 item_2_world_pos = item_2:getParent():convertToWorldSpace(cc.p(item_2:getPosition())); 416 item_2_world_pos = item_2:getParent():convertToWorldSpace(cc.p(item_2:getPosition()));
417 local _size = item_2:getContentSize(); 417 local _size = item_2:getContentSize();
418 local to_pos = cc.p(item_2_world_pos.x,item_2_world_pos.y-_size.height*0.8+10); 418 local to_pos = cc.p(item_2_world_pos.x,item_2_world_pos.y-_size.height*0.8+10);
419 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.5,to_pos),cc.CallFunc:create(item_move_to_complete))); 419 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.2,to_pos),cc.CallFunc:create(item_move_to_complete)));
420 else 420 else
421 print("无出击影响宠物不出去攻击"); 421 print("无出击影响宠物不出去攻击");
422 item_move_back_complete(); 422 item_move_back_complete();
...@@ -514,10 +514,10 @@ function PetPkScene:show_round_ack_other(round_ack_data,index,btl_round_data) ...@@ -514,10 +514,10 @@ function PetPkScene:show_round_ack_other(round_ack_data,index,btl_round_data)
514 self:update_pet_pos(); 514 self:update_pet_pos();
515 elseif _has_pet_die then 515 elseif _has_pet_die then
516 --出击过程中,有宠物死了,等待1秒时间宠物播放死亡动画,宠物归位 516 --出击过程中,有宠物死了,等待1秒时间宠物播放死亡动画,宠物归位
517 item_1:runAction(cc.Sequence:create(cc.DelayTime:create(1),cc.MoveTo:create(0.5,item_1_world_pos),cc.CallFunc:create(item_move_back_complete))); 517 item_1:runAction(cc.Sequence:create(cc.DelayTime:create(1),cc.MoveTo:create(0.2,item_1_world_pos),cc.CallFunc:create(item_move_back_complete)));
518 else 518 else
519 --出击的宠物延时归位 519 --出击的宠物延时归位
520 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.5,item_1_world_pos),cc.CallFunc:create(item_move_back_complete))); 520 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.2,item_1_world_pos),cc.CallFunc:create(item_move_back_complete)));
521 end 521 end
522 end 522 end
523 523
...@@ -566,7 +566,7 @@ function PetPkScene:show_round_ack_other(round_ack_data,index,btl_round_data) ...@@ -566,7 +566,7 @@ function PetPkScene:show_round_ack_other(round_ack_data,index,btl_round_data)
566 item_2_world_pos = item_2:getParent():convertToWorldSpace(cc.p(item_2:getPosition())); 566 item_2_world_pos = item_2:getParent():convertToWorldSpace(cc.p(item_2:getPosition()));
567 local _size = item_2:getContentSize(); 567 local _size = item_2:getContentSize();
568 local to_pos = cc.p(item_2_world_pos.x,item_2_world_pos.y+_size.height*0.8-10); 568 local to_pos = cc.p(item_2_world_pos.x,item_2_world_pos.y+_size.height*0.8-10);
569 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.5,to_pos),cc.CallFunc:create(item_move_to_complete))); 569 item_1:runAction(cc.Sequence:create(cc.MoveTo:create(0.2,to_pos),cc.CallFunc:create(item_move_to_complete)));
570 else 570 else
571 item_move_back_complete(); 571 item_move_back_complete();
572 end 572 end
...@@ -714,7 +714,7 @@ function PetPkScene:show_ack_effect_pet(round_ack_data,show_effect_complete,effe ...@@ -714,7 +714,7 @@ function PetPkScene:show_ack_effect_pet(round_ack_data,show_effect_complete,effe
714 --沒有攻擊者的情況 714 --沒有攻擊者的情況
715 local add_buff_hp = self:add_pet_buff(item,v.add_buf); 715 local add_buff_hp = self:add_pet_buff(item,v.add_buf);
716 update_up = update_up + add_buff_hp; 716 update_up = update_up + add_buff_hp;
717 print("buff 增加血量:",add_buff_hp); 717 print("没有攻击者的 buff 增加血量:",add_buff_hp);
718 end 718 end
719 719
720 local cur_hp = _hp + update_up; 720 local cur_hp = _hp + update_up;
......
...@@ -87,7 +87,7 @@ function FriendRecordView:updateItems() ...@@ -87,7 +87,7 @@ function FriendRecordView:updateItems()
87 local info = _list[i+1]; 87 local info = _list[i+1];
88 if info then 88 if info then
89 local item = cc.CSLoader:createNode("ui/friend/FriendRecordItem.csb"); 89 local item = cc.CSLoader:createNode("ui/friend/FriendRecordItem.csb");
90 item:setPosition(cc.p(0,_y - (i+1)*140)); 90 item:setPosition(cc.p(15,_y - (i+1)*140));
91 self.scrollView:addChild(item); 91 self.scrollView:addChild(item);
92 local btn = item:getChildByName("btn"); 92 local btn = item:getChildByName("btn");
93 btn.is_item = true; 93 btn.is_item = true;
......
...@@ -576,14 +576,14 @@ ...@@ -576,14 +576,14 @@
576 <AbstractNodeData Name="tips_new_activity" ActionTag="1244916588" Tag="711" IconVisible="False" LeftMargin="586.2501" RightMargin="522.7499" TopMargin="114.7639" BottomMargin="425.2361" ctype="SpriteObjectData"> 576 <AbstractNodeData Name="tips_new_activity" ActionTag="1244916588" Tag="711" IconVisible="False" LeftMargin="586.2501" RightMargin="522.7499" TopMargin="114.7639" BottomMargin="425.2361" ctype="SpriteObjectData">
577 <Size X="171.0000" Y="180.0000" /> 577 <Size X="171.0000" Y="180.0000" />
578 <Children> 578 <Children>
579 <AbstractNodeData Name="img" ActionTag="737114898" Tag="712" IconVisible="False" LeftMargin="-24.9023" RightMargin="-32.0977" TopMargin="17.2955" BottomMargin="-32.2955" ctype="SpriteObjectData"> 579 <AbstractNodeData Name="img" ActionTag="737114898" Tag="712" IconVisible="False" LeftMargin="-9.9023" RightMargin="-17.0977" TopMargin="61.7955" BottomMargin="12.2045" ctype="SpriteObjectData">
580 <Size X="228.0000" Y="195.0000" /> 580 <Size X="198.0000" Y="106.0000" />
581 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 581 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
582 <Position X="89.0977" Y="65.2045" /> 582 <Position X="89.0977" Y="65.2045" />
583 <Scale ScaleX="0.6500" ScaleY="0.6500" /> 583 <Scale ScaleX="0.6500" ScaleY="0.6500" />
584 <CColor A="255" R="255" G="255" B="255" /> 584 <CColor A="255" R="255" G="255" B="255" />
585 <PrePosition X="0.5210" Y="0.3622" /> 585 <PrePosition X="0.5210" Y="0.3622" />
586 <PreSize X="1.3333" Y="1.0833" /> 586 <PreSize X="1.1579" Y="0.5889" />
587 <FileData Type="Normal" Path="ui/Activity/btn_activity_11001_s.png" Plist="" /> 587 <FileData Type="Normal" Path="ui/Activity/btn_activity_11001_s.png" Plist="" />
588 <BlendFunc Src="1" Dst="771" /> 588 <BlendFunc Src="1" Dst="771" />
589 </AbstractNodeData> 589 </AbstractNodeData>
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 <FileData Type="Normal" Path="ui/friend/bg_friend_lv.png" Plist="" /> 116 <FileData Type="Normal" Path="ui/friend/bg_friend_lv.png" Plist="" />
117 <BlendFunc Src="1" Dst="771" /> 117 <BlendFunc Src="1" Dst="771" />
118 </AbstractNodeData> 118 </AbstractNodeData>
119 <AbstractNodeData Name="tip" ActionTag="1389603593" Tag="431" IconVisible="False" LeftMargin="-21.9916" RightMargin="-22.0084" TopMargin="176.4960" BottomMargin="-35.4960" LeftEage="67" RightEage="67" TopEage="12" BottomEage="12" Scale9OriginX="67" Scale9OriginY="12" Scale9Width="70" Scale9Height="15" ctype="ImageViewObjectData"> 119 <AbstractNodeData Name="tip" ActionTag="1389603593" VisibleForFrame="False" Tag="431" IconVisible="False" LeftMargin="-21.9916" RightMargin="-22.0084" TopMargin="176.4960" BottomMargin="-35.4960" LeftEage="67" RightEage="67" TopEage="12" BottomEage="12" Scale9OriginX="67" Scale9OriginY="12" Scale9Width="70" Scale9Height="15" ctype="ImageViewObjectData">
120 <Size X="204.0000" Y="39.0000" /> 120 <Size X="204.0000" Y="39.0000" />
121 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 121 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
122 <Position X="80.0084" Y="-15.9960" /> 122 <Position X="80.0084" Y="-15.9960" />
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 <PreSize X="1.2750" Y="0.2167" /> 126 <PreSize X="1.2750" Y="0.2167" />
127 <FileData Type="Normal" Path="ui/friend/bg_friend_tip_title.png" Plist="" /> 127 <FileData Type="Normal" Path="ui/friend/bg_friend_tip_title.png" Plist="" />
128 </AbstractNodeData> 128 </AbstractNodeData>
129 <AbstractNodeData Name="btn_del" ActionTag="-1211988783" Tag="223" IconVisible="False" LeftMargin="1.6505" RightMargin="2.3495" TopMargin="216.5365" BottomMargin="-94.5365" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="126" Scale9Height="36" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 129 <AbstractNodeData Name="btn_del" ActionTag="-1211988783" VisibleForFrame="False" Tag="223" IconVisible="False" LeftMargin="1.6505" RightMargin="2.3495" TopMargin="216.5365" BottomMargin="-94.5365" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="126" Scale9Height="36" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
130 <Size X="156.0000" Y="58.0000" /> 130 <Size X="156.0000" Y="58.0000" />
131 <Children> 131 <Children>
132 <AbstractNodeData Name="txt" ActionTag="363492436" Tag="225" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="30.0000" RightMargin="30.0000" TopMargin="17.0000" BottomMargin="17.0000" FontSize="24" LabelText="删除好友" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 132 <AbstractNodeData Name="txt" ActionTag="363492436" Tag="225" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="30.0000" RightMargin="30.0000" TopMargin="17.0000" BottomMargin="17.0000" FontSize="24" LabelText="删除好友" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
......
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="67.2862" />
7 </HorizontalList>
8 <VerticalList>
9 <Guides Position="639.9345" />
10 </VerticalList>
11 </Value>
5 </Item> 12 </Item>
6 </Properties> 13 </Properties>
7 </UserData> 14 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -28,15 +28,14 @@ ...@@ -28,15 +28,14 @@
28 <FileData Type="Normal" Path="ui/friend/jilu_xinfeng.png" Plist="" /> 28 <FileData Type="Normal" Path="ui/friend/jilu_xinfeng.png" Plist="" />
29 <BlendFunc Src="1" Dst="771" /> 29 <BlendFunc Src="1" Dst="771" />
30 </AbstractNodeData> 30 </AbstractNodeData>
31 <AbstractNodeData Name="txt_date" ActionTag="892018575" Tag="662" IconVisible="False" LeftMargin="155.4336" RightMargin="766.5664" TopMargin="19.3576" BottomMargin="87.6424" FontSize="20" LabelText="2月22日" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 31 <AbstractNodeData Name="txt_date" ActionTag="892018575" Tag="662" IconVisible="False" LeftMargin="157.4336" RightMargin="768.5664" TopMargin="21.3576" BottomMargin="89.6424" FontSize="20" LabelText="2月22日" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
32 <Size X="74.0000" Y="24.0000" /> 32 <Size X="70.0000" Y="20.0000" />
33 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 33 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
34 <Position X="192.4336" Y="99.6424" /> 34 <Position X="192.4336" Y="99.6424" />
35 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 35 <Scale ScaleX="1.0000" ScaleY="1.0000" />
36 <CColor A="255" R="217" G="155" B="0" /> 36 <CColor A="255" R="165" G="42" B="42" />
37 <PrePosition X="0.1932" Y="0.7606" /> 37 <PrePosition X="0.1932" Y="0.7606" />
38 <PreSize X="0.0743" Y="0.1832" /> 38 <PreSize X="0.0703" Y="0.1527" />
39 <FontResource Type="Normal" Path="" Plist="" />
40 <OutlineColor A="255" R="255" G="0" B="0" /> 39 <OutlineColor A="255" R="255" G="0" B="0" />
41 <ShadowColor A="255" R="110" G="110" B="110" /> 40 <ShadowColor A="255" R="110" G="110" B="110" />
42 </AbstractNodeData> 41 </AbstractNodeData>
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
56 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 55 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
57 <Position X="626.1846" Y="65.5264" /> 56 <Position X="626.1846" Y="65.5264" />
58 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 57 <Scale ScaleX="1.0000" ScaleY="1.0000" />
59 <CColor A="255" R="217" G="155" B="0" /> 58 <CColor A="255" R="165" G="42" B="42" />
60 <PrePosition X="0.6287" Y="0.5002" /> 59 <PrePosition X="0.6287" Y="0.5002" />
61 <PreSize X="0.3012" Y="0.6107" /> 60 <PreSize X="0.3012" Y="0.6107" />
62 <OutlineColor A="255" R="255" G="0" B="0" /> 61 <OutlineColor A="255" R="255" G="0" B="0" />
...@@ -65,45 +64,30 @@ ...@@ -65,45 +64,30 @@
65 <AbstractNodeData Name="btn" ActionTag="830597574" Tag="864" IconVisible="False" LeftMargin="795.5753" RightMargin="44.4247" TopMargin="42.9669" BottomMargin="30.0331" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="126" Scale9Height="36" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 64 <AbstractNodeData Name="btn" ActionTag="830597574" Tag="864" IconVisible="False" LeftMargin="795.5753" RightMargin="44.4247" TopMargin="42.9669" BottomMargin="30.0331" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="126" Scale9Height="36" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
66 <Size X="156.0000" Y="58.0000" /> 65 <Size X="156.0000" Y="58.0000" />
67 <Children> 66 <Children>
68 <AbstractNodeData Name="txt" CanEdit="False" ActionTag="1103535747" Tag="865" IconVisible="False" LeftMargin="39.0000" RightMargin="39.0000" TopMargin="15.0000" BottomMargin="15.0000" FontSize="24" LabelText="拜访TA" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 67 <AbstractNodeData Name="selected" ActionTag="577552035" Tag="866" IconVisible="False" LeftMargin="-3.0000" RightMargin="-3.0000" TopMargin="-1.0000" BottomMargin="-1.0000" ctype="SpriteObjectData">
69 <Size X="78.0000" Y="28.0000" /> 68 <Size X="162.0000" Y="60.0000" />
70 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 69 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
71 <Position X="78.0000" Y="29.0000" /> 70 <Position X="78.0000" Y="29.0000" />
72 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 71 <Scale ScaleX="1.0000" ScaleY="1.0000" />
73 <CColor A="255" R="22" G="105" B="0" /> 72 <CColor A="255" R="255" G="255" B="255" />
74 <PrePosition X="0.5000" Y="0.5000" /> 73 <PrePosition X="0.5000" Y="0.5000" />
75 <PreSize X="0.5000" Y="0.4828" /> 74 <PreSize X="1.0385" Y="1.0345" />
76 <FontResource Type="Normal" Path="" Plist="" /> 75 <FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
77 <OutlineColor A="255" R="255" G="0" B="0" /> 76 <BlendFunc Src="1" Dst="771" />
78 <ShadowColor A="255" R="110" G="110" B="110" />
79 </AbstractNodeData> 77 </AbstractNodeData>
80 <AbstractNodeData Name="selected" CanEdit="False" ActionTag="577552035" Tag="866" IconVisible="False" ctype="SpriteObjectData"> 78 <AbstractNodeData Name="txt" ActionTag="1103535747" Tag="865" IconVisible="False" LeftMargin="42.0000" RightMargin="42.0000" TopMargin="17.0000" BottomMargin="17.0000" FontSize="24" LabelText="拜访TA" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
81 <Size X="156.0000" Y="58.0000" /> 79 <Size X="72.0000" Y="24.0000" />
82 <Children>
83 <AbstractNodeData Name="txt" CanEdit="False" ActionTag="1191734275" Tag="867" IconVisible="False" LeftMargin="39.0000" RightMargin="39.0000" TopMargin="15.0000" BottomMargin="15.0000" FontSize="24" LabelText="拜访TA" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
84 <Size X="78.0000" Y="28.0000" />
85 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 80 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
86 <Position X="78.0000" Y="29.0000" /> 81 <Position X="78.0000" Y="29.0000" />
87 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 82 <Scale ScaleX="1.0000" ScaleY="1.0000" />
88 <CColor A="255" R="179" G="61" B="0" /> 83 <CColor A="255" R="22" G="105" B="0" />
89 <PrePosition X="0.5000" Y="0.5000" /> 84 <PrePosition X="0.5000" Y="0.5000" />
90 <PreSize X="0.5000" Y="0.4828" /> 85 <PreSize X="0.4615" Y="0.4138" />
91 <FontResource Type="Normal" Path="" Plist="" />
92 <OutlineColor A="255" R="255" G="0" B="0" /> 86 <OutlineColor A="255" R="255" G="0" B="0" />
93 <ShadowColor A="255" R="110" G="110" B="110" /> 87 <ShadowColor A="255" R="110" G="110" B="110" />
94 </AbstractNodeData> 88 </AbstractNodeData>
95 </Children> 89 </Children>
96 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 90 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
97 <Position X="78.0000" Y="29.0000" />
98 <Scale ScaleX="1.0000" ScaleY="1.0000" />
99 <CColor A="255" R="255" G="255" B="255" />
100 <PrePosition X="0.5000" Y="0.5000" />
101 <PreSize X="1.0000" Y="1.0000" />
102 <FileData Type="Normal" Path="common/btn_green_s.png" Plist="" />
103 <BlendFunc Src="1" Dst="771" />
104 </AbstractNodeData>
105 </Children>
106 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
107 <Position X="873.5753" Y="59.0331" /> 91 <Position X="873.5753" Y="59.0331" />
108 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 92 <Scale ScaleX="1.0000" ScaleY="1.0000" />
109 <CColor A="255" R="255" G="255" B="255" /> 93 <CColor A="255" R="255" G="255" B="255" />
......
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <VerticalList>
6 <Guides Position="631.0410" />
7 </VerticalList>
8 </Value>
5 </Item> 9 </Item>
6 </Properties> 10 </Properties>
7 </UserData> 11 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 <Image Name="bg_app_view02.png" /> 22 <Image Name="bg_app_view02.png" />
23 <Image Name="bg_fnt_pop.png" /> 23 <Image Name="bg_fnt_pop.png" />
24 <Image Name="bg_fnt_pop2.png" /> 24 <Image Name="bg_fnt_pop2.png" />
25 <Image Name="bg_friend_search_818_547.png" />
25 <Image Name="bg_huodong.png" /> 26 <Image Name="bg_huodong.png" />
26 <Image Name="bg_huodong_top.png" /> 27 <Image Name="bg_huodong_top.png" />
27 <Image Name="bg_icon.png" /> 28 <Image Name="bg_icon.png" />
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
34 <Image Name="bg_pop.png" /> 35 <Image Name="bg_pop.png" />
35 <Image Name="bg_pop_people.png" /> 36 <Image Name="bg_pop_people.png" />
36 <Image Name="bg_pop_title.png" /> 37 <Image Name="bg_pop_title.png" />
38 <Image Name="bg_recommend_friend_962_636.png" />
37 <Image Name="bg_shop_item_icon.png" /> 39 <Image Name="bg_shop_item_icon.png" />
38 <Image Name="bg_team_item.png" /> 40 <Image Name="bg_team_item.png" />
39 <Image Name="btn_back.png" /> 41 <Image Name="btn_back.png" />
...@@ -66,6 +68,7 @@ ...@@ -66,6 +68,7 @@
66 <Image Name="title_activity.png" /> 68 <Image Name="title_activity.png" />
67 <Image Name="title_bug_daoju.png" /> 69 <Image Name="title_bug_daoju.png" />
68 <Image Name="title_no_money.png" /> 70 <Image Name="title_no_money.png" />
71 <Image Name="title_recommend_friend.png" />
69 <Image Name="title_set.png" /> 72 <Image Name="title_set.png" />
70 <Image Name="title_share.png" /> 73 <Image Name="title_share.png" />
71 <Image Name="title_tishi.png" /> 74 <Image Name="title_tishi.png" />
......
...@@ -31,11 +31,10 @@ ...@@ -31,11 +31,10 @@
31 <Item Key="TabsParamsKey"> 31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo"> 32 <Value ctype="TabsInfo">
33 <OpenedDocuments> 33 <OpenedDocuments>
34 <FilePathData Path="ui/friend/FriendLayer.csd" /> 34 <FilePathData Path="ui/friend/FriendSearchLayer.csd" />
35 <FilePathData Path="ui/friend/FriendItemLayer.csd" /> 35 <FilePathData Path="ui/xyx/XyxRewardLayer.csd" />
36 <FilePathData Path="ui/MainScene.csd" />
37 </OpenedDocuments> 36 </OpenedDocuments>
38 <ActiveDocument Path="ui/MainScene.csd" /> 37 <ActiveDocument Path="ui/xyx/XyxRewardLayer.csd" />
39 </Value> 38 </Value>
40 </Item> 39 </Item>
41 </Properties> 40 </Properties>
......