0515

@@ -10,7 +10,7 @@
     <fanpai_game_play_cnt>5</fanpai_game_play_cnt>
     <best>2</best>
     <game_play_cnt>17</game_play_cnt>
-    <cake_best>90</cake_best>
+    <cake_best>104</cake_best>
     <haidao_best>250</haidao_best>
     <guess_game_play_cnt>2</guess_game_play_cnt>
     <guess_best>18</guess_best>

-
-btl_cnt_reward        新手对局福利
-create_reward         新手创建礼包
-
-game                  每日上限最大值、救济金
-game_birds            飞禽走兽配置表
-game_fruit_machine    水果机配置表
-game_score            积分产出
-gd_charm              ——————
-gd_score              积分称号
-head                  头像、头像框对应魅力值、积分
-item                  物品
-lobby_room_cfg        游戏房间的配置：底分、门票、进入房间限制、机器人携带钱数、输赢封顶倍数
-login                 登陆大转盘中，连续登录几天的奖励
-mail                  邮件配置，战况、周活动奖励、更新版本奖励等
-nick                  昵称随机
-niuniu                牛牛：抢庄、押注
-notice                公告
-online_reward         每日在线礼包
-pay                   支付购买相关：商城点券、充值活动
-rank_exprie_reward      周赛活动排行榜 名次 奖励
-rank_yesterday_reward   排行榜 昨天名次 奖励
-role_reward             登陆1-7天，奖励的道具	
-rules                   掼蛋单机规则提示
-shop                    商城出售
-shop_medal              勋章产出游戏、上限
-sign                    ——————
-task_daily              每日任务
-turntable               登陆大转盘中，抽奖
-xx_lobby_room_cfg       开房房卡消耗
-achievement	 成就
\ No newline at end of file

@@ -11,6 +11,7 @@ local function init()
             local info = {};
             info.id = tonumber(contents[1]);
             info.name = contents[2];
+            --logD("ItemInfo-------------------------------->"..contents[2]);
             info.describe = string.gsub(contents[3],"@br@","\n");
             info.icon = contents[4];
             info.shopID = tonumber(contents[5]);

@@ -35,7 +35,8 @@ function DecorateView:init()
     self.scrollView = self.panel:getChildByName("ScrollView");
 
     self.nodesCopy = {};
-    self.nodesCopy[1] = {self.btn_back};
+    --self.nodesCopy[1] = {self.btn_back};    --nodesCopy表嵌套表{{self.btn_back}}
+    self.nodesCopy[1] = {};
     for i=1,3 do
         local tab = self.panel:getChildByName("tab_"..i);
         tab:setTag(i);
@@ -45,7 +46,9 @@ function DecorateView:init()
         end;
         tab:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onTabClick))end);
         self.nodesCopy[1][#self.nodesCopy[1]+1] = tab;
-    end
+    end --{{self.btn_back,tab1,tab2,tab3}}
+    self.nodesCopy[1][#self.nodesCopy[1]+1] = self.btn_back;
+    --logD("self.nodesCopy[1]---num----------------->"..#self.nodesCopy[1]);--4
 
     self.btn_pre = self.panel:getChildByName("btn_pre");
     self.btn_pre.fn = handler(self,self.onPreClick);
@@ -112,6 +115,7 @@ function DecorateView:setTab(_tab)
 end
 
 function DecorateView:updateTabState()
+    logD("tab_index-------------------->"..tab_index);
     if tab_index == 1 then
         self.runningScene.mask_area_1:setVisible(true);
         self.runningScene.mask_area_2:setVisible(false);
@@ -125,7 +129,7 @@ function DecorateView:updateTabState()
     for i=1,3 do
         local tab = self.panel:getChildByName("tab_"..i);
         local selected = tab:getChildByName("select");
-        if i == tab_index then
+        if i == tab_index then    --tab为1-3
             selected:setVisible(true);
         else
             selected:setVisible(false);
@@ -205,7 +209,7 @@ function DecorateView:updateItems()
     self.nodes = TableUtil.merge(self.nodesCopy,list_nodes);
     
     if self.nodeIndex == 1 then
-        self.selectedIndex = tab_index+1;
+        self.selectedIndex = tab_index;
     end
     self:updateSelectedState(false);
 end
@@ -468,7 +472,7 @@ function DecorateView:onKeypadUp()
 
     if self.nodeIndex == 2 then
         self.nodeIndex = 1;
-        self.selectedIndex = tab_index + 1;
+        self.selectedIndex = tab_index ;
         self:updateSelectedState(false);
     else
         DecorateView.super.onKeypadUp(self,false);
@@ -527,9 +531,10 @@ function DecorateView:onKeypadLeft()
     DecorateView.super.onKeypadLeft(self,false);
 
     local node = self.nodes[self.nodeIndex][self.selectedIndex];
-    if self.nodeIndex <= #self.nodesCopy and self.selectedIndex > 1 and node and node.fn then
+    --logD("left--------------------------->"..self.selectedIndex);
+    if self.nodeIndex <= #self.nodesCopy and self.selectedIndex < 4 and node and node.fn then   --Tab之间跳转        
         node.fn();
-    elseif self.nodeIndex == 2 and node then
+    elseif self.nodeIndex == 2 and node then        --Item之间跳转
         self:onItemOver(node);
     end
 end
@@ -546,7 +551,10 @@ function DecorateView:onKeypadRight()
     DecorateView.super.onKeypadRight(self,false);
 
     local node = self.nodes[self.nodeIndex][self.selectedIndex];
-    if self.nodeIndex <= #self.nodesCopy and self.selectedIndex > 1 and node and node.fn then
+    --nodeIndex暂定为1=tab，2=Item；
+    --selectedIndex为tab和btn_back之间的切换
+    --logD("right--------------------------->"..self.selectedIndex);1、2、3、4
+    if self.nodeIndex <= #self.nodesCopy and self.selectedIndex < 4 and node and node.fn then
         node.fn();
     elseif self.nodeIndex == 2 and node then
         self:onItemOver(node);

@@ -17,7 +17,8 @@ function XyxGameOver:show(info,exitFun,againFun)
     inst.exitFun = exitFun;
     inst.againFun = againFun;
 
-    inst:getChildByName("panel"):getChildByName("txt_score"):setString(info.level.."");
+    inst:getChildByName("panel"):getChildByName("panel_reward"):getChildByName("txt_score"):setString("得分"..info.level.."");
+    inst:getChildByName("panel"):getChildByName("panel_noreward"):getChildByName("txt_score"):setString("得分"..info.level.."");
     inst:getChildByName("panel"):getChildByName("panel_reward"):setVisible(false);
     inst:getChildByName("panel"):getChildByName("panel_noreward"):setVisible(false);
 
@@ -62,6 +63,7 @@ function XyxGameOver:onGameEndCallBackFun(params)
                     if cc.FileUtils:getInstance():isFileExist(icon_url) then
                         item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
                     end
+                    --logD("output test------------------------>"..info.name);--这里乱码
                     item:getChildByName("txt"):setString(info.name.."×"..data.cnt);
                     if data.id == 100001 then
                         local left_vip_day = UserModel.getLeftVipDay();

@@ -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="37.0000" RightMargin="37.0000" TopMargin="37.0000" BottomMargin="37.0000" ctype="SpriteObjectData">
-            <Size X="122.0000" Y="124.0000" />
+          <AbstractNodeData Name="bg_bag_item" ActionTag="316582286" Tag="2333" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-1.0000" RightMargin="-1.0000" TopMargin="-2.0000" BottomMargin="-2.0000" ctype="SpriteObjectData">
+            <Size X="108.0000" Y="108.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="0.3833" Y="0.3833" />
-            <FileData Type="Normal" Path="common/bg_icon.png" Plist="" />
+            <PreSize X="1.0167" Y="1.0333" />
+            <FileData Type="Normal" Path="ui/xyx/bg_clear_10.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">
@@ -33,34 +33,34 @@
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <Position X="56.4069" Y="-19.3912" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
-            <CColor A="255" R="35" G="105" B="154" />
+            <CColor A="255" R="255" G="165" B="0" />
             <PrePosition X="0.4701" Y="-0.1616" />
             <PreSize X="1.2000" Y="0.2000" />
             <OutlineColor A="255" R="255" G="0" B="0" />
             <ShadowColor A="255" R="110" G="110" B="110" />
           </AbstractNodeData>
-          <AbstractNodeData Name="vip" ActionTag="2058042718" Tag="2358" IconVisible="False" LeftMargin="-89.9995" RightMargin="29.9995" TopMargin="-32.4741" BottomMargin="77.4741" ctype="SpriteObjectData">
-            <Size X="180.0000" Y="75.0000" />
+          <AbstractNodeData Name="vip" ActionTag="2058042718" Tag="2358" IconVisible="False" LeftMargin="-51.9995" RightMargin="67.9995" TopMargin="-41.4741" BottomMargin="68.4741" ctype="SpriteObjectData">
+            <Size X="104.0000" Y="93.0000" />
             <Children>
-              <AbstractNodeData Name="txt_1" ActionTag="536707435" Tag="2359" RotationSkewX="-9.0590" RotationSkewY="-9.0599" IconVisible="False" LeftMargin="16.2000" RightMargin="83.8000" TopMargin="23.0805" BottomMargin="1.9195" IsCustomSize="True" FontSize="28" LabelText="VIP8" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+              <AbstractNodeData Name="txt_1" ActionTag="536707435" Tag="2359" RotationSkewX="-40.0000" RotationSkewY="-40.0009" IconVisible="False" LeftMargin="13.1991" RightMargin="10.8009" TopMargin="55.0791" BottomMargin="-12.0791" IsCustomSize="True" FontSize="24" LabelText="VIP8" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
                 <Size X="80.0000" Y="50.0000" />
                 <AnchorPoint ScaleY="0.5000" />
-                <Position X="16.2000" Y="26.9195" />
+                <Position X="13.1991" Y="12.9209" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="246" G="121" B="19" />
-                <PrePosition X="0.0900" Y="0.3589" />
-                <PreSize X="0.4444" Y="0.6667" />
+                <PrePosition X="0.1269" Y="0.1389" />
+                <PreSize X="0.7692" Y="0.5376" />
                 <OutlineColor A="255" R="255" G="0" B="0" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
               </AbstractNodeData>
-              <AbstractNodeData Name="txt_2" ActionTag="-782075880" Tag="2360" RotationSkewX="-9.0592" RotationSkewY="-9.0599" IconVisible="False" LeftMargin="83.8237" RightMargin="-3.8237" TopMargin="12.0072" BottomMargin="12.9928" IsCustomSize="True" FontSize="28" LabelText="+20%" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+              <AbstractNodeData Name="txt_2" ActionTag="-782075880" Tag="2360" RotationSkewX="-40.0000" RotationSkewY="-40.0007" IconVisible="False" LeftMargin="48.8212" RightMargin="-44.8212" TopMargin="26.0054" BottomMargin="16.9946" IsCustomSize="True" FontSize="28" LabelText="+20%" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
                 <Size X="100.0000" Y="50.0000" />
                 <AnchorPoint ScaleY="0.5000" />
-                <Position X="83.8237" Y="37.9928" />
+                <Position X="48.8212" Y="41.9946" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="246" G="121" B="19" />
-                <PrePosition X="0.4657" Y="0.5066" />
-                <PreSize X="0.5556" Y="0.6667" />
+                <PrePosition X="0.4694" Y="0.4516" />
+                <PreSize X="0.9615" Y="0.5376" />
                 <OutlineColor A="255" R="255" G="0" B="0" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
               </AbstractNodeData>
@@ -70,8 +70,8 @@
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <CColor A="255" R="255" G="255" B="255" />
             <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="" />
+            <PreSize X="0.8667" Y="0.7750" />
+            <FileData Type="Normal" Path="ui/xyx/bg_clear_vip_20.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
         </Children>

 <UserData Version="3.10.0.0">
   <Properties>
     <Item Key="GuidesList">
-      <Value ctype="GuidesData" />
+      <Value ctype="GuidesData">
+        <HorizontalList>
+          <Guides Direction="Horizontal" Position="232.7070" />
+          <Guides Direction="Horizontal" Position="643.3945" />
+        </HorizontalList>
+        <VerticalList>
+          <Guides Position="648.4615" />
+        </VerticalList>
+      </Value>
     </Item>
   </Properties>
 </UserData>
\ No newline at end of file

@@ -512,6 +512,7 @@
             <Image Name="bg_item_tab_qz_2.png" />
             <Image Name="btn_arrow_1.png" />
             <Image Name="btn_arrow_2.png" />
+            <Image Name="btn_arrwo.png" />
             <Image Name="btn_back_1.png" />
             <Image Name="btn_back_2.png" />
             <Image Name="decorate_use_tips.png" />
@@ -931,6 +932,24 @@
             <Image Name="yiwancheng.png" />
           </Folder>
           <Folder Name="xyx">
+            <Image Name="bg_clear_1.png" />
+            <Image Name="bg_clear_10.png" />
+            <Image Name="bg_clear_11.png" />
+            <Image Name="bg_clear_12.png" />
+            <Image Name="bg_clear_13.png" />
+            <Image Name="bg_clear_14.png" />
+            <Image Name="bg_clear_15.png" />
+            <Image Name="bg_clear_16.png" />
+            <Image Name="bg_clear_17.png" />
+            <Image Name="bg_clear_2.png" />
+            <Image Name="bg_clear_3.png" />
+            <Image Name="bg_clear_4.png" />
+            <Image Name="bg_clear_5.png" />
+            <Image Name="bg_clear_6.png" />
+            <Image Name="bg_clear_7.png" />
+            <Image Name="bg_clear_8.png" />
+            <Image Name="bg_clear_9.png" />
+            <Image Name="bg_clear_vip_20.png" />
             <Image Name="bg_xyx.png" />
             <Image Name="bg_xyx_buy.png" />
             <Image Name="bg_xyx_head.png" />

@@ -28,14 +28,5 @@
         <LastRunType Value="Windows" />
       </Value>
     </Item>
-    <Item Key="TabsParamsKey">
-      <Value ctype="TabsInfo">
-        <OpenedDocuments>
-          <FilePathData Path="ui/friend/FriendSearchLayer.csd" />
-          <FilePathData Path="ui/xyx/XyxRewardLayer.csd" />
-        </OpenedDocuments>
-        <ActiveDocument Path="ui/xyx/XyxRewardLayer.csd" />
-      </Value>
-    </Item>
   </Properties>
 </UserData>
\ No newline at end of file