Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 50f2e36f 50f2e36f5c958bf8e326efc4e8c6bf5c01800a90 by jinwawa
Options

0510

1 parent 7b96a3da
Expand all
Inline Side-by-side
Showing 35 changed files with 84 additions and 89 deletions
......@@ -320,7 +320,7 @@
<lv id="9" ack="2" def="12" ai="90" />
<lv id="10" ack="2" def="12" ai="95" />
</pet>
<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ú ">
<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ú ">
<lv id="1" ack="2" def="10" ai="10" />
<lv id="2" ack="2" def="10" ai="20" />
<lv id="3" ack="2" def="10" ai="30" />
......@@ -1244,7 +1244,7 @@
<lv id="9" ack="5" def="16" ai="90" />
<lv id="10" ack="5" def="16" ai="95" />
</pet>
<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万年，被誉为“活化石”和“中国国宝”，是中国特有物种。靠吃竹子为生，食物营养低劣，不能有过多的能量贮存。为了保存能量，必须控制能量消耗过大的活动，行动缓慢。视觉极不发达。">
<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万年，被誉为“活化石”和“中国国宝”，是中国特有物种。靠吃竹子为生，食物营养低劣，不能有过多的能量贮存。为了保存能量，必须控制能量消耗过大的活动，行动缓慢。视觉极不发达。">
<lv id="1" ack="2" def="10" ai="10" />
<lv id="2" ack="2" def="10" ai="20" />
<lv id="3" ack="2" def="10" ai="30" />
......
......@@ -168,7 +168,7 @@ function PetInfo.get_pet_list_by_kind(attr)
return list;
end
-- 获取该品质钥匙需要对应宠物的数量
-- 获取该品质钥匙需要对应宠物的数量（TODO：已经改为换一个水晶对应各品质宠物需要多少个才能换 _jinwawa）
function PetInfo.get_key_need_pet_cnt(star)
return star_key_map[star].petCnt;
end
......
......@@ -46,7 +46,7 @@ function ChenghaoView:update()
for i=0,#self.list-1 do
local info = self.list[i+1];
local item = cc.CSLoader:createNode("ui/chenghao/ChenghaoItem.csb");
item:setPosition(cc.p(30,_y - (i+1)*100));
item:setPosition(cc.p(40,_y - (i+1)*100));
self.scrollView:addChild(item);
item.is_item = true;
......
......@@ -79,7 +79,8 @@ function PetFightView:update()
cnt = pet_data.cnt;
end
local lv_info = PetInfo.get_lv_by_exp(pet_info.id,exp);
if exp >= PetInfo.get_max_exp(pet_info.id) then
logD(exp.."PetFightView------------>"..PetInfo.get_max_exp(pet_info.id));
if exp < PetInfo.get_max_exp(pet_info.id) then
item:getChildByName("pet_lv"):getChildByName("txt"):setString("Lv."..lv_info.lv);
else
item:getChildByName("pet_lv"):getChildByName("txt"):setString("MAX");
......
......@@ -525,6 +525,7 @@ logD("RoleMainView:onKeypadRight(tab_to_tab)-------------------->>");
elseif not self.selected_node.can_move_to_horizontal and not self.selected_node.is_tab and node.is_tab and not node.is_vertical_tab then
-- 左右键不能从普通按钮切换的水平标签按钮
else--]]
--logD("onKeypadRight---------------->");
local _p = node:getParent():convertToWorldSpace(cc.p(node:getPosition()));
_p = self:changeToCenterPoint(node, _p);
if _p.x > curPos.x + self.range_value then
......
......@@ -49,13 +49,13 @@ function RolePetSellView:init()
local star_cnt_map = {};
for i,v in ipairs(pets_list) do
local star = PetInfo.get_pet_info(v.id).star;
local need_cnt = PetInfo.get_key_need_pet_cnt(star);
local star = PetInfo.get_pet_info(v.id).star; --宠物星级
local need_cnt = PetInfo.get_key_need_pet_cnt(star); -- 获取水晶需要对应品质宠物的数量
if not star_cnt_map[star] then
star_cnt_map[star] = {star=star,key_cnt=0,pet_cnt=0};
end
local can_sell_cnt = star_cnt_map[star].pet_cnt + v.cnt - 1;
local can_sell_cnt = star_cnt_map[star].pet_cnt + v.cnt - 1; --可以卖出的宠物
local sell_left_cnt = can_sell_cnt%need_cnt;
local sell_key_cnt = math.floor(can_sell_cnt/need_cnt);
if sell_key_cnt > 0 then
......@@ -79,9 +79,9 @@ function RolePetSellView:init()
if info and info.key_cnt > 0 then
local need_cnt = PetInfo.get_key_need_pet_cnt(info.star);
local star_info = PetInfo.get_star_info(info.star)
self.panel:getChildByName("item_"..i):getChildByName("txt_1"):setString("出售"..star_info.name.."品质的宠物×"..info.key_cnt*need_cnt.."只，获得银钥匙");
self.panel:getChildByName("item_"..i):getChildByName("txt_1"):setString("出售"..star_info.name.."品质的宠物×"..info.key_cnt*need_cnt.."只，获得技能水晶"..star_info.name);
self.panel:getChildByName("item_"..i):getChildByName("txt_2"):setString("×"..info.key_cnt);
local key_id = (200000+info.star);
local key_id = (300000+info.star);
self.panel:getChildByName("item_"..i):getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/icon/"..key_id..".png"):getSpriteFrame());
self.is_no_pet_sell = false;
else
......
......@@ -16,7 +16,7 @@ function RolePetView:init(_nodes,_update_nodes_func)
local new_nodes = {};
self.nodes[#self.nodes+1] = new_nodes;
for i=1,3 do
local tab = self:getChildByName("tab_kind_"..i);
local tab = self:getChildByName("tab_kind_"..i):getChildByName("btn");
tab:setSwallowTouches(false);
tab.is_tab = true;
tab:setTag(i);
......@@ -93,13 +93,13 @@ end
function RolePetView:updateTabState()
for i=1,3 do
local tab = self:getChildByName("tab_kind_"..i);
local select = tab:getChildByName("select");
local tab = self:getChildByName("tab_kind_"..i):getChildByName("btn");
local select = self:getChildByName("tab_kind_"..i):getChildByName("select");
if i == _index then
tab.is_selected = true;
select:setVisible(true);
self:update();
tab:setLocalZOrder(10);
--tab:setLocalZOrder(10);
else
tab.is_selected = false;
select:setVisible(false);
......
......@@ -52,13 +52,13 @@
<AbstractNodeData Name="panel_scroll" ActionTag="-777621122" Tag="4454" IconVisible="False" LeftMargin="-117.0000" RightMargin="847.0000" TopMargin="29.0000" BottomMargin="11.0000" ClipAble="True" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="320.0000" Y="480.0000" />
<Children>
<AbstractNodeData Name="scroll" ActionTag="-1677488121" Tag="4455" IconVisible="False" LeftMargin="44.9998" RightMargin="-44.9998" TopMargin="0.0006" BottomMargin="-0.0006" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<AbstractNodeData Name="scroll" ActionTag="-1677488121" Tag="4455" IconVisible="False" LeftMargin="0.9998" RightMargin="-0.9998" TopMargin="0.0008" BottomMargin="-0.0008" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="320.0000" Y="480.0000" />
<AnchorPoint />
<Position X="44.9998" Y="-0.0006" />
<Position X="0.9998" Y="-0.0008" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1406" Y="0.0000" />
<PrePosition X="0.0031" Y="0.0000" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
......
......@@ -6,15 +6,15 @@
<ObjectData Name="Scene" ctype="GameNodeObjectData">
<Size X="1280.0000" Y="720.0000" />
<Children>
<AbstractNodeData Name="bg" ActionTag="953446860" Tag="5" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="617.0000" RightMargin="617.0000" TopMargin="337.0000" BottomMargin="337.0000" ctype="SpriteObjectData">
<AbstractNodeData Name="bg" ActionTag="953446860" Tag="5" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="640.0000" Y="360.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="0.0359" Y="0.0639" />
<FileData Type="Normal" Path="bg/bg_loading.png" Plist="" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="bg/bg_loading.jpg" Plist="" />
<BlendFunc Src="770" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="txt_update_ver" ActionTag="1813049155" Tag="355" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="18.9440" RightMargin="1191.0560" TopMargin="680.9120" BottomMargin="19.0880" FontSize="20" LabelText="ver:1.0" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
......@@ -65,15 +65,14 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="txt" ActionTag="639322624" Tag="127" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="535.0000" RightMargin="535.0000" TopMargin="640.9000" BottomMargin="36.1000" FontSize="30" LabelText="正在载入资源..." OutlineSize="4" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="210.0000" Y="43.0000" />
<AbstractNodeData Name="txt" ActionTag="639322624" Tag="127" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="527.5000" RightMargin="527.5000" TopMargin="647.4000" BottomMargin="42.6000" FontSize="30" LabelText="正在载入资源..." OutlineSize="4" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="225.0000" Y="30.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="640.0000" Y="57.6000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="242" G="123" B="27" />
<PrePosition X="0.5000" Y="0.0800" />
<PreSize X="0.1641" Y="0.0597" />
<FontResource Type="Normal" Path="" Plist="" />
<PreSize X="0.1758" Y="0.0417" />
<OutlineColor A="255" R="255" G="255" B="255" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......
......@@ -27,7 +27,7 @@
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="0.0359" Y="0.0639" />
<FileData Type="Normal" Path="bg/bg_loading.png" Plist="" />
<FileData Type="Normal" Path="bg/bg_loading.jpg" Plist="" />
<BlendFunc Src="770" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="panel" ActionTag="-1040660810" Tag="20" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
......
......@@ -27,7 +27,7 @@
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="bg/bg_loading.png" Plist="" />
<FileData Type="Default" Path="Default/Sprite.png" Plist="" />
<BlendFunc Src="770" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="panel" ActionTag="1310775727" Tag="118" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
......
......@@ -45,77 +45,77 @@
<FileData Type="Normal" Path="ui/achievement/item_achievement_get.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="item_2" ActionTag="-1808911970" Tag="248" IconVisible="False" LeftMargin="230.4106" RightMargin="77.5894" TopMargin="371.2515" BottomMargin="90.7485" ctype="SpriteObjectData">
<Size X="120.0000" Y="120.0000" />
<AbstractNodeData Name="item_2" ActionTag="-1808911970" Tag="248" IconVisible="False" LeftMargin="219.4105" RightMargin="86.5895" TopMargin="369.2515" BottomMargin="88.7485" ctype="SpriteObjectData">
<Size X="122.0000" Y="124.0000" />
<Children>
<AbstractNodeData Name="icon" ActionTag="-403988613" Tag="249" IconVisible="False" LeftMargin="22.1961" RightMargin="17.8039" TopMargin="20.5502" BottomMargin="19.4498" ctype="SpriteObjectData">
<AbstractNodeData Name="icon" ActionTag="-403988613" Tag="249" IconVisible="False" LeftMargin="22.1961" RightMargin="-56.1961" TopMargin="-53.4498" BottomMargin="19.4498" ctype="SpriteObjectData">
<Size X="80.0000" Y="80.0000" />
<AnchorPoint ScaleX="0.4494" ScaleY="0.5498" />
<Position X="58.1481" Y="63.4338" />
<Scale ScaleX="0.8000" ScaleY="0.8000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4846" Y="0.5286" />
<PreSize X="0.6667" Y="0.6667" />
<PrePosition X="1.2641" Y="1.3790" />
<PreSize X="1.7391" Y="1.7391" />
<FileData Type="Normal" Path="icon/100001.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="txt" ActionTag="2095579626" Tag="250" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="29.2520" RightMargin="10.7480" TopMargin="68.2260" BottomMargin="1.7740" IsCustomSize="True" FontSize="22" LabelText="x200" HorizontalAlignmentType="HT_Right" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<AbstractNodeData Name="txt" ActionTag="2095579626" Tag="250" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="19.4183" RightMargin="22.5817" TopMargin="69.9325" BottomMargin="4.0675" IsCustomSize="True" FontSize="22" LabelText="x200" HorizontalAlignmentType="HT_Right" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="80.0000" Y="50.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="69.2520" Y="26.7740" />
<Position X="59.4183" Y="29.0675" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="40" G="163" B="198" />
<PrePosition X="0.5771" Y="0.2231" />
<PreSize X="0.6667" Y="0.4167" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4870" Y="0.2344" />
<PreSize X="1.7391" Y="1.0870" />
<OutlineColor A="255" R="255" G="255" B="255" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="290.4106" Y="150.7485" />
<Position X="280.4105" Y="150.7485" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.6785" Y="0.2590" />
<PreSize X="0.2804" Y="0.2062" />
<FileData Type="Default" Path="Default/Sprite.png" Plist="" />
<PrePosition X="0.6552" Y="0.2590" />
<PreSize X="0.1075" Y="0.0790" />
<FileData Type="Normal" Path="common/bg_icon.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="item_1" ActionTag="-1172683141" Tag="251" IconVisible="False" LeftMargin="77.2436" RightMargin="230.7564" TopMargin="371.2515" BottomMargin="90.7485" ctype="SpriteObjectData">
<Size X="120.0000" Y="120.0000" />
<AbstractNodeData Name="item_1" ActionTag="-1172683141" Tag="251" IconVisible="False" LeftMargin="91.2451" RightMargin="214.7549" TopMargin="371.2515" BottomMargin="86.7485" ctype="SpriteObjectData">
<Size X="122.0000" Y="124.0000" />
<Children>
<AbstractNodeData Name="icon" ActionTag="-550103559" Tag="252" IconVisible="False" LeftMargin="22.1961" RightMargin="17.8039" TopMargin="20.5502" BottomMargin="19.4498" ctype="SpriteObjectData">
<AbstractNodeData Name="icon" ActionTag="-550103559" Tag="252" IconVisible="False" LeftMargin="22.1961" RightMargin="-56.1961" TopMargin="-53.4498" BottomMargin="19.4498" ctype="SpriteObjectData">
<Size X="80.0000" Y="80.0000" />
<AnchorPoint ScaleX="0.4494" ScaleY="0.5498" />
<Position X="58.1481" Y="63.4338" />
<Scale ScaleX="0.8000" ScaleY="0.8000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4846" Y="0.5286" />
<PreSize X="0.6667" Y="0.6667" />
<PrePosition X="1.2641" Y="1.3790" />
<PreSize X="1.7391" Y="1.7391" />
<FileData Type="Normal" Path="icon/100001.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="txt" ActionTag="1322833304" Tag="253" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="29.2520" RightMargin="10.7480" TopMargin="68.2260" BottomMargin="1.7740" IsCustomSize="True" FontSize="22" LabelText="x200" HorizontalAlignmentType="HT_Right" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<AbstractNodeData Name="txt" ActionTag="1322833304" Tag="253" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="21.2380" RightMargin="20.7620" TopMargin="70.7806" BottomMargin="3.2194" IsCustomSize="True" FontSize="22" LabelText="x200" HorizontalAlignmentType="HT_Right" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="80.0000" Y="50.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="69.2520" Y="26.7740" />
<Position X="61.2380" Y="28.2194" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="40" G="163" B="198" />
<PrePosition X="0.5771" Y="0.2231" />
<PreSize X="0.6667" Y="0.4167" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5020" Y="0.2276" />
<PreSize X="1.7391" Y="1.0870" />
<OutlineColor A="255" R="255" G="255" B="255" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="137.2436" Y="150.7485" />
<Position X="152.2451" Y="148.7485" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.3207" Y="0.2590" />
<PreSize X="0.2804" Y="0.2062" />
<FileData Type="Default" Path="Default/Sprite.png" Plist="" />
<PrePosition X="0.3557" Y="0.2556" />
<PreSize X="0.1075" Y="0.0790" />
<FileData Type="Normal" Path="common/bg_icon.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="yilingqu" ActionTag="1457800972" Tag="247" IconVisible="False" LeftMargin="151.9785" RightMargin="160.0215" TopMargin="471.6927" BottomMargin="59.3072" ctype="SpriteObjectData">
<AbstractNodeData Name="yilingqu" ActionTag="1457800972" Tag="247" IconVisible="False" LeftMargin="151.9785" RightMargin="160.0215" TopMargin="471.6928" BottomMargin="59.3072" ctype="SpriteObjectData">
<Size X="116.0000" Y="51.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="209.9785" Y="84.8072" />
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="280.9359" />
</HorizontalList>
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
......@@ -19,7 +19,7 @@
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="btn_close" ActionTag="-756877439" Tag="1622" IconVisible="False" LeftMargin="53.2438" RightMargin="1148.7561" TopMargin="36.8653" BottomMargin="605.1347" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="48" Scale9Height="56" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<AbstractNodeData Name="btn_close" ActionTag="-756877439" Tag="1622" IconVisible="False" LeftMargin="53.2438" RightMargin="1148.7562" TopMargin="36.8653" BottomMargin="605.1347" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="48" Scale9Height="56" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="78.0000" Y="78.0000" />
<Children>
<AbstractNodeData Name="selected" ActionTag="1414734588" VisibleForFrame="False" Tag="351" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
......@@ -50,10 +50,10 @@
<AbstractNodeData Name="panel" ActionTag="128256003" Tag="228" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="284.0000" RightMargin="284.0000" TopMargin="70.5000" BottomMargin="70.5000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" LeftEage="420" RightEage="420" TopEage="235" BottomEage="235" Scale9OriginX="-420" Scale9OriginY="-235" Scale9Width="840" Scale9Height="470" ctype="PanelObjectData">
<Size X="712.0000" Y="579.0000" />
<Children>
<AbstractNodeData Name="bg" ActionTag="2102699127" Tag="144" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-203.5018" RightMargin="-203.4982" TopMargin="-38.9993" BottomMargin="-39.0007" ctype="SpriteObjectData">
<AbstractNodeData Name="bg" ActionTag="2102699127" Tag="144" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-203.5000" RightMargin="-203.5000" TopMargin="-39.0000" BottomMargin="-39.0000" ctype="SpriteObjectData">
<Size X="1119.0000" Y="657.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="355.9982" Y="289.4993" />
<Position X="356.0000" Y="289.5000" />
<Scale ScaleX="0.5810" ScaleY="0.8719" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
......
......@@ -22,10 +22,10 @@
<AbstractNodeData Name="panel" ActionTag="1582634118" Tag="99" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="319.0000" RightMargin="319.0000" TopMargin="133.0000" BottomMargin="133.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" LeftEage="211" RightEage="211" TopEage="149" BottomEage="149" Scale9OriginX="211" Scale9OriginY="149" Scale9Width="250" Scale9Height="150" ctype="PanelObjectData">
<Size X="642.0000" Y="454.0000" />
<Children>
<AbstractNodeData Name="bg_alert_title_1" ActionTag="1832463939" Tag="295" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="150.0001" RightMargin="149.9999" TopMargin="-25.8284" BottomMargin="385.8284" ctype="SpriteObjectData">
<AbstractNodeData Name="bg_alert_title_1" ActionTag="1832463939" Tag="295" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="150.0000" RightMargin="150.0000" TopMargin="-25.8284" BottomMargin="385.8284" ctype="SpriteObjectData">
<Size X="342.0000" Y="94.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="321.0001" Y="432.8284" />
<Position X="321.0000" Y="432.8284" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.9534" />
......@@ -44,10 +44,10 @@
<FileData Type="Normal" Path="common/title_tishi.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="btn_ok" ActionTag="-329577038" Tag="101" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="239.5799" RightMargin="240.4201" TopMargin="364.5053" BottomMargin="29.4947" 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">
<AbstractNodeData Name="btn_ok" ActionTag="-329577038" Tag="101" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="239.5506" RightMargin="240.4494" TopMargin="364.5053" BottomMargin="29.4947" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="162.0000" Y="60.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="320.5799" Y="59.4947" />
<Position X="320.5506" Y="59.4947" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4993" Y="0.1310" />
......@@ -59,13 +59,13 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="txt_btn_ok" ActionTag="-1168520158" Tag="140" IconVisible="False" LeftMargin="286.9739" RightMargin="290.0261" TopMargin="378.6827" BottomMargin="49.3173" FontSize="26" LabelText="购 买" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<AbstractNodeData Name="txt_btn_ok" ActionTag="-1168520158" Tag="140" IconVisible="False" LeftMargin="287.7384" RightMargin="289.2616" TopMargin="378.6827" BottomMargin="49.3173" FontSize="26" LabelText="出 售" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="65.0000" Y="26.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="319.4739" Y="62.3173" />
<Position X="320.2384" Y="62.3173" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="0" G="128" B="0" />
<PrePosition X="0.4976" Y="0.1373" />
<PrePosition X="0.4988" Y="0.1373" />
<PreSize X="0.1012" Y="0.0573" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
......@@ -100,7 +100,7 @@
<PreSize X="0.9346" Y="0.1101" />
<FileData Type="Normal" Path="ui/dress/PetSellItem.csd" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="item_4" ActionTag="1331903113" Tag="125" IconVisible="True" LeftMargin="20.7579" RightMargin="21.2421" TopMargin="196.5909" BottomMargin="207.4090" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData">
<AbstractNodeData Name="item_4" ActionTag="1331903113" Tag="125" IconVisible="True" LeftMargin="20.7579" RightMargin="21.2421" TopMargin="196.5910" BottomMargin="207.4090" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="1.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData">
<Size X="600.0000" Y="50.0000" />
<AnchorPoint />
<Position X="20.7579" Y="207.4090" />
......
......@@ -3,7 +3,7 @@
<Item Key="GuidesList">
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="456.8917" />
<Guides Direction="Horizontal" Position="461.5961" />
</HorizontalList>
<VerticalList>
<Guides Position="-10.4046" />
......
......@@ -6,15 +6,15 @@
<ObjectData Name="Layer" Tag="2332" ctype="GameLayerObjectData">
<Size X="120.0000" Y="120.0000" />
<Children>
<AbstractNodeData Name="bg_bag_item" ActionTag="316582286" Tag="2333" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="120.0000" Y="120.0000" />
<AbstractNodeData Name="bg_bag_item" ActionTag="316582286" Tag="2333" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="37.0000" RightMargin="37.0000" TopMargin="37.0000" BottomMargin="37.0000" ctype="SpriteObjectData">
<Size X="122.0000" Y="124.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="60.0000" Y="60.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Default" Path="Default/Sprite.png" Plist="" />
<PreSize X="0.3833" Y="0.3833" />
<FileData Type="Normal" Path="common/bg_icon.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="icon" ActionTag="-509607983" Tag="2334" IconVisible="False" LeftMargin="20.8742" RightMargin="19.1258" TopMargin="21.1258" BottomMargin="18.8742" ctype="SpriteObjectData">
......@@ -46,7 +46,7 @@
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1417" Y="0.9165" />
<PreSize X="1.5000" Y="0.6250" />
<PreSize X="0.9667" Y="0.5500" />
<FileData Type="Normal" Path="ui/xyx/bg_xyx_pk_vip_jia.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
......
......@@ -6,15 +6,15 @@
<ObjectData Name="Layer" Tag="2332" ctype="GameLayerObjectData">
<Size X="120.0000" Y="120.0000" />
<Children>
<AbstractNodeData Name="bg_bag_item" ActionTag="316582286" Tag="2333" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-2.0000" RightMargin="-2.0000" TopMargin="-2.0000" BottomMargin="-2.0000" ctype="SpriteObjectData">
<Size X="120.0000" Y="120.0000" />
<AbstractNodeData Name="bg_bag_item" ActionTag="316582286" Tag="2333" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="37.0000" RightMargin="37.0000" TopMargin="37.0000" BottomMargin="37.0000" ctype="SpriteObjectData">
<Size X="122.0000" Y="124.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="60.0000" Y="60.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="1.0333" Y="1.0333" />
<FileData Type="Default" Path="Default/Sprite.png" Plist="" />
<PreSize X="0.3833" Y="0.3833" />
<FileData Type="Normal" Path="common/bg_icon.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="icon" ActionTag="-509607983" Tag="2334" IconVisible="False" LeftMargin="20.8742" RightMargin="19.1258" TopMargin="21.1258" BottomMargin="18.8742" ctype="SpriteObjectData">
......@@ -50,7 +50,6 @@
<CColor A="255" R="246" G="121" B="19" />
<PrePosition X="0.0900" Y="0.3589" />
<PreSize X="0.4444" Y="0.6667" />
<FontResource Type="Normal" Path="" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......@@ -62,7 +61,6 @@
<CColor A="255" R="246" G="121" B="19" />
<PrePosition X="0.4657" Y="0.5066" />
<PreSize X="0.5556" Y="0.6667" />
<FontResource Type="Normal" Path="" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
......@@ -71,7 +69,7 @@
<Position X="0.0005" Y="114.9741" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition Y="0.9581" />
<PrePosition X="0.0000" Y="0.9581" />
<PreSize X="1.5000" Y="0.6250" />
<FileData Type="Normal" Path="ui/xyx/bg_xyx_vip_jia.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
......
......@@ -10,7 +10,7 @@
<Image Name="bg_exit_1.png" />
<Image Name="bg_exit_2.png" />
<Image Name="bg_exit_pop.png" />
<Image Name="bg_loading.png" />
<Image Name="bg_loading.jpg" />
</Folder>
<Folder Name="common">
<Image Name="bg_app_mini.png" />
......
......@@ -28,13 +28,5 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/achievement/AchievementLayer.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/achievement/AchievementLayer.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......