submit shdx version v1.3

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/bird/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/bird/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/bird/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 10;

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/bird/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/bird/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/bird/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/bird/game_data");
 

@@ -30,11 +30,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -13,11 +13,11 @@ end
 function CakeScene:onCreate(params)
     self.keypadManager = KeypadManager:create(self);
     
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/cake/CakeScene_IP.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/cake/CakeScene_IP.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/cake/CakeScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

 local GameStartView;
-if CHANNEL == "shdx" then
-   GameStartView  = dialog.uinode("ui/cake/CakeStartLayer_IP.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--   GameStartView  = dialog.uinode("ui/cake/CakeStartLayer_IP.csb",import("..view.BaseViewNew"));
+--else
     GameStartView  = dialog.uinode("ui/cake/CakeStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local cake_data = require("app.views.cake.cake_data");
 

@@ -29,11 +29,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene_IP.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene_IP.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -21,11 +21,11 @@ function GameScene:onCreate(params)
 
     self.panel = self.ui:getChildByName("panel");
 
-    if CHANNEL == "shdx" then
-        self.girl = cc.CSLoader:createNode("ui/candy/Girl_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.girl = cc.CSLoader:createNode("ui/candy/Girl_shdx.csb");
+    --else
         self.girl = cc.CSLoader:createNode("ui/candy/Girl.csb");
-    end
+    --end
     self.girl:setPosition(cc.p(display.width/2,0));
     self.panel:addChild(self.girl);
     self.shield = self.girl:getChildByName("shield");

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/candy/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/candy/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/candy/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/candy/game_data");
 

@@ -29,11 +29,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene.csb");
-    end
+    --end
     
     self:addChild(self.ui);
     --logD("LoadingScene------------->"..display.width);

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/feiyanzoubi/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/feiyanzoubi/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/feiyanzoubi/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 16;

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/feiyanzoubi/game_data");
 

@@ -30,11 +30,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/haidao/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/haidao/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/haidao/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 12;

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/haidao/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/haidao/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/haidao/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/haidao/game_data");
 

@@ -32,11 +32,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -10,7 +10,7 @@
     <fanpai_best>10</fanpai_best>
     <candy_best>2004</candy_best>
     <candy_game_play_cnt>111</candy_game_play_cnt>
-    <run_game_play_cnt>305</run_game_play_cnt>
+    <run_game_play_cnt>314</run_game_play_cnt>
     <run_best>25938</run_best>
     <is_game_vip>1</is_game_vip>
     <is_game_guide>1</is_game_guide>

 <?xml version="1.0"?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <propertyGroup>
-    <StartProgram>E:\xhx\client\runtime\win32\GuandanAndroid.exe</StartProgram>
-    <StartArguments>-workdir E:\xhx\client\runrun\client</StartArguments>
-    <StartWorkingDirectory>E:\xhx\client\runtime\win32</StartWorkingDirectory>
+    <StartProgram>D:\xhx\client\runtime\win32\GuandanAndroid.exe</StartProgram>
+    <StartArguments>-workdir D:\xhx\client\runrun\client</StartArguments>
+    <StartWorkingDirectory>D:\xhx\client\runtime\win32</StartWorkingDirectory>
   </propertyGroup>
 </Project>
\ No newline at end of file

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/run/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/run/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/run/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 16;

@@ -163,6 +163,7 @@ function GameScene:move()
 --        self.bg_far_bg_1:setPositionX(0);
 --    end
 
+    --远处景色移动
     local bg_mid_x = self.bg_mid_bg_1:getPositionX();
     self.bg_mid_bg_1:setPositionX(bg_mid_x-speed/3);
     self.bg_mid_bg_2:setPositionX(bg_mid_x-speed/3+self.bg_mid_rect.width);
@@ -170,6 +171,7 @@ function GameScene:move()
         self.bg_mid_bg_1:setPositionX(0);
     end
 
+    --近处的地面移动
     local bg_front_x = self.bg_front_bg_1:getPositionX();
     self.bg_front_bg_1:setPositionX(bg_front_x-speed);
     self.bg_front_bg_2:setPositionX(bg_front_x-speed+self.bg_front_rect.width);
@@ -212,6 +214,7 @@ function GameScene:create_map()
     self.current_level = self.current_level + 1;
 end
 
+--碰撞
 function GameScene:collide()
     if not self.map then
         return;

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/run/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/run/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/run/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/run/game_data");
 

@@ -32,11 +32,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/run/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --   self.ui = cc.CSLoader:createNode("ui/run/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/run/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -75,25 +75,25 @@
               <AbstractNodeData Name="bg_front" ActionTag="-795650236" Tag="32" IconVisible="False" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
                 <Size X="1280.0000" Y="720.0000" />
                 <Children>
-                  <AbstractNodeData Name="bg_1" ActionTag="-1054038358" Tag="19" IconVisible="False" RightMargin="-520.0000" TopMargin="320.0000" ctype="SpriteObjectData">
-                    <Size X="1800.0000" Y="400.0000" />
+                  <AbstractNodeData Name="bg_1" ActionTag="-1054038358" Tag="19" IconVisible="False" RightMargin="-520.0000" TopMargin="435.0000" ctype="SpriteObjectData">
+                    <Size X="1800.0000" Y="285.0000" />
                     <AnchorPoint />
                     <Position />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition />
-                    <PreSize X="1.4063" Y="0.5556" />
+                    <PreSize X="1.4063" Y="0.3958" />
                     <FileData Type="Normal" Path="ui/run/bg_front_1.png" Plist="" />
                     <BlendFunc Src="1" Dst="771" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="bg_2" ActionTag="-1449589531" Tag="20" IconVisible="False" LeftMargin="1800.0000" RightMargin="-2320.0000" TopMargin="320.0000" ctype="SpriteObjectData">
-                    <Size X="1800.0000" Y="400.0000" />
+                  <AbstractNodeData Name="bg_2" ActionTag="-1449589531" Tag="20" IconVisible="False" LeftMargin="1800.0000" RightMargin="-2320.0000" TopMargin="435.0000" ctype="SpriteObjectData">
+                    <Size X="1800.0000" Y="285.0000" />
                     <AnchorPoint />
                     <Position X="1800.0000" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="1.4063" />
-                    <PreSize X="1.4063" Y="0.5556" />
+                    <PreSize X="1.4063" Y="0.3958" />
                     <FileData Type="Normal" Path="ui/run/bg_front_1.png" Plist="" />
                     <BlendFunc Src="1" Dst="771" />
                   </AbstractNodeData>

@@ -35,8 +35,9 @@
           <FilePathData Path="ui/run/GameStartLayer.csd" />
           <FilePathData Path="ui/run/GameStartLayer_shdx.csd" />
           <FilePathData Path="ui/run/LoadingScene_shdx.csd" />
+          <FilePathData Path="ui/run/GameScene.csd" />
         </OpenedDocuments>
-        <ActiveDocument Path="ui/run/LoadingScene_shdx.csd" />
+        <ActiveDocument Path="ui/run/GameScene.csd" />
       </Value>
     </Item>
   </Properties>

@@ -3,7 +3,7 @@
     <!--m0800279afc6c-->
     <!--m0800278b87c2-->
     <!---->
-    <Account>m0800278b87c</Account>
+    <Account>m0800278b87d</Account>
     <exp>0</exp>
     <versionnum>201801291657</versionnum>
     <isMusic>0</isMusic>
@@ -26,7 +26,7 @@
     <new_guide_step>4</new_guide_step>
     <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
     <feiyanzoubi_best>603</feiyanzoubi_best>
-    <uid>1030100010142927</uid>
+    <uid>1010100010142867</uid>
     <is_bird_game_guide>1</is_bird_game_guide>
     <bird_best>1107</bird_best>
     <is_haidao_game_guide>1</is_haidao_game_guide>

@@ -108,7 +108,7 @@
 		<score val="70"  item="100002,10;100001,150;600002,1"  rate="70" key="200001,50;200002,50"			/>
 		<score val="80"  item="100002,10;100001,150;600002,2"  rate="80" key="200001,50;200002,30;200003,20"  />
   </game>
-  <game id="7" ename="run" name="奔跑吧小马宝莉" needVip="1" idx="7" payid="23" diamond="10" flag="">
+  <game id="7" ename="run" name="奔跑吧小兔子" needVip="1" idx="7" payid="23" diamond="10" flag="">
 		<score val="0"    item="" key=""/>
 		<score val="100"  item="100002,2;100001,50;600001,2"   rate="30" key="200001,100"										/>
 		<score val="200"  item="100002,4;100001,80;600001,3"   rate="40" key="200001,100"										/>
@@ -144,7 +144,7 @@
 		<score val="900"  item="100002,10;100001,150;600002,1"  rate="70" key="200001,20;200002,30;200003,30;200004,20"			/>
 		<score val="1100" item="100002,10;100001,150;600002,2" rate="80" key="200001,25;200002,20;200003,20;200004,20;200005,15" />
   </game>
-  <game id="10" ename="bird" name="火箭小黄人" needVip="1" idx="1" payid="24" diamond="15" flag="new">
+  <game id="10" ename="bird" name="火箭小象" needVip="1" idx="1" payid="24" diamond="15" flag="new">
 		<score val="0"    item="" key=""/>
 		<score val="64"   item="100002,2;100001,50;600001,2"   rate="30" key="200001,100"													/>
 		<score val="192"  item="100002,4;100001,80;600001,3"   rate="40" key="200001,100"													/>

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/bird/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/bird/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/bird/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 10;

@@ -138,7 +138,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self.hero:init();
     self.hero:setPosition(self.hero.original_p);

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/bird/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/bird/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/bird/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/bird/game_data");
 
@@ -12,7 +12,6 @@ function GameStartView:ctor()
     GameStartView.super.ctor(self);
 end
 
---onStartFn在GameScene中调用启动游戏
 function GameStartView:show(onStartFn)
     local scene = cc.Director:getInstance():getRunningScene()
     local inst = GameStartView:create();
@@ -157,33 +156,19 @@ function GameStartView:onStart()
         end
         self:close();
     end
-    GAME_ID=EnumGame.BIRD;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.BIRD);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            logUI("每天免费玩一次： "..free_every_day_num.val1);
-            if free_every_day_num.val1==0 then
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -30,11 +30,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/bird/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -13,11 +13,11 @@ end
 function CakeScene:onCreate(params)
     self.keypadManager = KeypadManager:create(self);
     
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/cake/CakeScene_IP.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/cake/CakeScene_IP.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/cake/CakeScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));
@@ -234,7 +234,6 @@ end
 
 function CakeScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 end
 
 function CakeScene:startMoveGou()
@@ -568,7 +567,7 @@ function CakeScene:onKeypadOk()
 
     if not self.is_starting then
         self:startGame();
-    else
+    elseif self.cur_cake~=nil then
         self.tips_show:hide();
         self:drop_cake();
     end

 local GameStartView;
-if CHANNEL == "shdx" then
-   GameStartView  = dialog.uinode("ui/cake/CakeStartLayer_IP.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--   GameStartView  = dialog.uinode("ui/cake/CakeStartLayer_IP.csb",import("..view.BaseViewNew"));
+--else
     GameStartView  = dialog.uinode("ui/cake/CakeStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local cake_data = require("app.views.cake.cake_data");
 
@@ -111,32 +111,18 @@ function GameStartView:onStart()
         SoundManager.playEffect("res/ui/cake/star.ogg");
         self:close();
     end
-    GAME_ID=EnumGame.CAKE;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.CAKE);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -29,11 +29,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene_IP.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene_IP.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/cake/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -5,6 +5,7 @@ cake_data.best = 0;
 cake_data.speed = 10;
 
 local _list = {};
+--countdown_probability:碰到倒计时的概率，countdown_time:倒计时时间
 _list[#_list+1] = {degree=1,score=0,award=0,speed_add=1,countdown_probability=0,countdown_time=0,size_list={{size=1,probability=50},{size=2,probability=50}}};
 _list[#_list+1] = {degree=2,score=5,award=0,speed_add=1.3,countdown_probability=0,countdown_time=0,size_list={{size=1,probability=30},{size=2,probability=70}}};
 _list[#_list+1] = {degree=3,score=10,award=0,speed_add=1.5,countdown_probability=30,countdown_time=8,size_list={{size=2,probability=60},{size=3,probability=40}}};

@@ -21,11 +21,11 @@ function GameScene:onCreate(params)
 
     self.panel = self.ui:getChildByName("panel");
 
-    if CHANNEL == "shdx" then
-        self.girl = cc.CSLoader:createNode("ui/candy/Girl_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.girl = cc.CSLoader:createNode("ui/candy/Girl_shdx.csb");
+    --else
         self.girl = cc.CSLoader:createNode("ui/candy/Girl.csb");
-    end
+    --end
     self.girl:setPosition(cc.p(display.width/2,0));
     self.panel:addChild(self.girl);
     self.shield = self.girl:getChildByName("shield");
@@ -115,7 +115,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self.current_item_list = {};
 
@@ -186,7 +185,7 @@ function GameScene:createBoomFun()
         self:createCandy(1,-_info.boom_speed);
     end
 end
-
+--防护罩
 function GameScene:createShieldFun()
     local _info = game_data.get_info_by_score(self.score);
 

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/candy/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/candy/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/candy/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/candy/game_data");
 
@@ -110,33 +110,19 @@ function GameStartView:onStart()
         end
         self:close();
     end
-     GAME_ID=EnumGame.CANDY;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.CANDY);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -29,14 +29,14 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/candy/LoadingScene.csb");
-    end
+    --end
     
     self:addChild(self.ui);
-
+    --logD("LoadingScene------------->"..display.width);
     self.ui:setContentSize(cc.size(display.width,display.height));
     ccui.Helper:doLayout(self.ui);
 

@@ -63,7 +63,6 @@ function GameOverView:onAgain()
     end
 
     if IS_XHX then
-        
         paySuccessFun();
     elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
         local reciever = require("app.views.fanpai.GamePayView"):show("",paySuccessFun);

@@ -75,7 +75,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
     self.is_show_result = false;
     self.is_flopping = false;
     self.current_item = nil;

@@ -146,32 +146,18 @@ function GameStartView:onStart()
         end
         self:close();
     end
-    GAME_ID=EnumGame.FANPAI;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.FANPAI);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
             end
             return;
         else

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/feiyanzoubi/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/feiyanzoubi/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/feiyanzoubi/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 16;

@@ -182,7 +182,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self.hero:init();
     self.hero:setPosition(self.hero.original_p);

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/feiyanzoubi/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/feiyanzoubi/game_data");
 
@@ -116,33 +116,19 @@ function GameStartView:onStart()
         end
         self:close();
     end
-    GAME_ID=EnumGame.FEIYANZOUBI;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.FEIYANZOUBI);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -30,11 +30,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/feiyanzoubi/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -84,8 +84,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
-
     self.is_show_result = false;
     SoundManager.playMusic("res/ui/guess/bg_music_game.mp3");
 

@@ -104,32 +104,18 @@ function GameStartView:onStart()
         end
         self:close();
     end
-     GAME_ID=EnumGame.GUESS;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
             end
             return;
         else

@@ -85,7 +85,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
     self.is_show_result = false;
 
     self.fruit_bg:show();

@@ -104,32 +104,18 @@ function GameStartView:onStart()
         end
         self:close();
     end
-     GAME_ID=EnumGame.GUESS_COLOR;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS_COLOR);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
             end
             return;
         else

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/haidao/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/haidao/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/haidao/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 12;

@@ -158,7 +158,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self.mapContainer:setScale(HAIDAO_MAP_SCALE);
 

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/haidao/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/haidao/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/haidao/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/haidao/game_data");
 
@@ -156,33 +156,19 @@ function GameStartView:onStart()
         end
         self:close();
     end
-    GAME_ID=EnumGame.HAIDAO;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.HAIDAO);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -32,11 +32,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/haidao/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

 local GameHero = class("GameHero",function ()
-    if CHANNEL == "shdx" then
-        return cc.CSLoader:createNode("ui/run/Hero_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --    return cc.CSLoader:createNode("ui/run/Hero_shdx.csb");
+    --else
         return cc.CSLoader:createNode("ui/run/Hero.csb");
-    end
+    --end
 end)
 
 local jump_speed = 16;

@@ -134,7 +134,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self.hero:init();
     self.hero:setPosition(self.hero.original_p);
@@ -164,6 +163,7 @@ function GameScene:move()
 --        self.bg_far_bg_1:setPositionX(0);
 --    end
 
+    --远处景色移动
     local bg_mid_x = self.bg_mid_bg_1:getPositionX();
     self.bg_mid_bg_1:setPositionX(bg_mid_x-speed/3);
     self.bg_mid_bg_2:setPositionX(bg_mid_x-speed/3+self.bg_mid_rect.width);
@@ -171,6 +171,7 @@ function GameScene:move()
         self.bg_mid_bg_1:setPositionX(0);
     end
 
+    --近处的地面移动
     local bg_front_x = self.bg_front_bg_1:getPositionX();
     self.bg_front_bg_1:setPositionX(bg_front_x-speed);
     self.bg_front_bg_2:setPositionX(bg_front_x-speed+self.bg_front_rect.width);
@@ -213,6 +214,7 @@ function GameScene:create_map()
     self.current_level = self.current_level + 1;
 end
 
+--碰撞
 function GameScene:collide()
     if not self.map then
         return;

 local GameStartView;
-if CHANNEL == "shdx" then
-    GameStartView = dialog.uinode("ui/run/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
-else
+--if CHANNEL == "shdx" then
+--    GameStartView = dialog.uinode("ui/run/GameStartLayer_shdx.csb",import("..view.BaseViewNew"));
+--else
     GameStartView = dialog.uinode("ui/run/GameStartLayer.csb",import("..view.BaseViewNew"));
-end
+--end
 
 local game_data = require("app/views/run/game_data");
 
@@ -157,33 +157,19 @@ function GameStartView:onStart()
         end
         self:close();
     end
-     GAME_ID=EnumGame.RABBIT;
+
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.RABBIT);
         print("打开小游戏：",game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
-            if free_every_day_num.val1==0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();

@@ -32,11 +32,11 @@ end
 function LoadingScene:onCreate()
     self.keypadManager = KeypadManager:create(self);
 
-    if CHANNEL == "shdx" then
-        self.ui = cc.CSLoader:createNode("ui/run/LoadingScene_shdx.csb");
-    else
+    --if CHANNEL == "shdx" then
+    --   self.ui = cc.CSLoader:createNode("ui/run/LoadingScene_shdx.csb");
+    --else
         self.ui = cc.CSLoader:createNode("ui/run/LoadingScene.csb");
-    end
+    --end
     self:addChild(self.ui);
 
     self.ui:setContentSize(cc.size(display.width,display.height));

@@ -74,7 +74,6 @@ end
 
 function GameScene:startGame()
     self.is_starting = true;
-    ItemManager.lock_pop = true;    --关掉弹窗
 
     self:showNextAnimal();
 end

-local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb", import("..view.BaseViewNew"));
+local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb",import("..view.BaseViewNew"));
 
 local game_data = require("app/views/shuyishu/game_data");
 
-local ox, oy = 1050, 128;
+local ox,oy = 1050,128;
 function GameStartView:ctor()
     GameStartView.super.ctor(self);
 end
@@ -20,16 +20,16 @@ function GameStartView:show(onStartFn)
 end
 
 function GameStartView:init()
-    self:setContentSize(cc.size(display.width, display.height));
+    self:setContentSize(cc.size(display.width,display.height));
     ccui.Helper:doLayout(self);
 
     local btn_start = self:getChildByName("btn_start");
-    btn_start.fn = handler(self, self.onStart);
-    btn_start:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_start.fn) end);
+    btn_start.fn = handler(self,self.onStart);
+    btn_start:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_start.fn)end);
 
     local btn_introduce = self:getChildByName("btn_introduce");
-    btn_introduce.fn = handler(self, self.onIntroduce);
-    btn_introduce:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_introduce.fn) end);
+    btn_introduce.fn = handler(self,self.onIntroduce);
+    btn_introduce:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_introduce.fn)end);
 
     self.bg_mask = self:getChildByName("bg_mask");
     self.bg_mask:hide();
@@ -37,11 +37,11 @@ function GameStartView:init()
     self.game_introduce:setLocalZOrder(100);
     self.game_introduce:hide();
 
-    self.nodes[1] = { btn_start, btn_introduce };
+    self.nodes[1] = {btn_start,btn_introduce};
     self:updateSelectedState(btn_start);
 
     if IS_XHX then
-        btn_introduce:setPosition(cc.p(80, display.height - 80));
+        btn_introduce:setPosition(cc.p(80,display.height-80));
         self:initRankView();
     end
 end
@@ -49,43 +49,43 @@ end
 function GameStartView:initRankView()
     self.rankView = cc.CSLoader:createNode("ui/xyx/XyxRankLayer.csb");
     local rect = self.rankView:getContentSize();
-    self.rankView:setPosition(cc.p(display.width - rect.width - 20, 20));
+    self.rankView:setPosition(cc.p(display.width-rect.width-20,20));
     self:addChild(self.rankView);
 
-    for i = 1, 8 do
-        self.rankView:getChildByName("item_" .. i):setVisible(false);
+    for i=1,8 do
+        self.rankView:getChildByName("item_"..i):setVisible(false);
     end
 
-    self.onRankResFun = handler(self, self.onRankRes);
-    cmsg.on("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
-    SocketClient:getInstance():send("gateway_msg.single_game_rank_msg", { id = EnumGame.SHUYISHU });
+    self.onRankResFun = handler(self,self.onRankRes);
+    cmsg.on("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
+    SocketClient:getInstance():send("gateway_msg.single_game_rank_msg",{id = EnumGame.SHUYISHU});
 end
 
 function GameStartView:onRankRes(params)
-    cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
+    cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
     self.rank_list = params.data.game_rank.rank_user;
-    for i = 1, 8 do
-        local item = self.rankView:getChildByName("item_" .. i);
+    for i=1,8 do
+        local item = self.rankView:getChildByName("item_"..i);
         if self.rank_list[i] then
             item:setVisible(true);
             if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then
-                item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick, 12) .. "...");
+                item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick,12).."...");
             else
                 item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick);
             end
             if i > 3 then
-                item:getChildByName("txt"):setColor(cc.c3b(255, 165, 0));
-                item:getChildByName("txt_score"):setColor(cc.c3b(255, 165, 0));
+                item:getChildByName("txt"):setColor(cc.c3b(255,165,0));
+                item:getChildByName("txt_score"):setColor(cc.c3b(255,165,0));
             end
             item:getChildByName("txt_score"):setString(self.rank_list[i].val);
 
             local btn = item:getChildByName("btn");
             btn.user_show = self.rank_list[i].user_show;
-            btn.fn = function()
+            btn.fn = function ()
                 self:onOpenUserInfo(btn);
             end;
-            btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onOpenUserInfo)) end);
-            self.nodes[1][#self.nodes[1] + 1] = btn;
+            btn:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onOpenUserInfo))end);
+            self.nodes[1][#self.nodes[1]+1] = btn;
         else
             item:setVisible(false);
         end
@@ -99,26 +99,26 @@ function GameStartView:onOpenUserInfo(ref)
 end
 
 function GameStartView:move()
-    if self.moveIndex <= #self.path and self.moveIndex >= 1 then
+    if self.moveIndex <= #self.path and self.moveIndex >=1 then
         local nextPoint = self.path[self.moveIndex];
 
-        self.star:setPosition(nextPoint.x + ox, - nextPoint.y + oy);
+        self.star:setPosition(nextPoint.x+ox,-nextPoint.y+oy);
         self.moveIndex = self.moveIndex + 1;
     else
         self:stopAction(self.repeatForver);
         self.repeatForver = nil;
 
-        self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5), cc.CallFunc:create( function()
-            self.star:setPosition(cc.p(ox, oy));
+        self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5),cc.CallFunc:create(function()
+            self.star:setPosition(cc.p(ox,oy));
             self.star:hide();
-        end )));
+        end)));
 
-        self:runAction(cc.Sequence:create(cc.DelayTime:create(3), cc.CallFunc:create( function()
+        self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.CallFunc:create(function()
             self.star:show();
             self.moveIndex = 1;
-            self.repeatForver = schedule(self, handler(self, self.move), 0);
+            self.repeatForver = schedule(self,handler(self,self.move),0);
             SoundManager.playEffect("res/ui/shuyishu/magic.mp3");
-        end )));
+        end)));
     end
 end
 
@@ -130,56 +130,40 @@ function GameStartView:onStart()
         self:close();
     end
 
-    GAME_ID = EnumGame.SHUYISHU;
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU);
-        print("打开小游戏：", game_info.id);
-        if UserModel.getLeftVipDay() == 0 then
+        print("打开小游戏：",game_info.id);
+        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             print("小游戏购买界面");
-            local free_every_day_num = UserModel.getSingleGameById(game_info.id);
-            -- 今天的免费次数是否用完
-            if free_every_day_num.val1 == 0 then
-                logUI("每天免费玩一次");
-                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
-                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
-                paySuccessFun();
-            else
-                local function okFun()
-                    if CHANNEL == "shdx" then
-                        local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-                    elseif CHANNEL == "cucc" then
-                        local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
-                        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            local my_diamond_num = UserModel.getDiamond();
+            if my_diamond_num >= game_info.diamond then
+                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             else
-                        local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
+                local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
             end
-                end
-                Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
-            end
             return;
         else
             paySuccessFun();
         end
     elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
-        local reciever = require("app.views.shuyishu.GamePayView"):show("", paySuccessFun);
+        local reciever = require("app.views.shuyishu.GamePayView"):show("",paySuccessFun);
         cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
     elseif CHANNEL == "ws" then
         local unlock_price = 9.9;
         local function onPaySuccessCallBack(result)
             if result == "success" then
-                UmengHelper.pay(unlock_price .. "&1");
+                UmengHelper.pay(unlock_price.."&1");
                 game_data.set_is_vip(1);
                 self:onStart();
             end
         end
         local function okPayFun()
             UmengHelper.onEvent("unlock_click");
-            ShopModel.pay("tjlhxkgxyx_unlock", "永久解锁", unlock_price, onPaySuccessCallBack, timeoutCallBack);
+            ShopModel.pay("tjlhxkgxyx_unlock","永久解锁",unlock_price,onPaySuccessCallBack,timeoutCallBack);
         end
         if game_data.get_is_vip() == 0 and game_data.get_game_play_cnt() >= 3 then
-            local receiver = require("app.views.view.AlertView"):show( { msg = "您的免费试玩已结束，是否花" .. unlock_price .. "元付费解锁？" }, okPayFun, nil, 1);
+            local receiver = require("app.views.view.AlertView"):show({msg="您的免费试玩已结束，是否花"..unlock_price.."元付费解锁？"},okPayFun,nil,1);
             cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
             return;
         else
@@ -202,27 +186,27 @@ end
 
 function GameStartView:close()
     if IS_XHX then
-        cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
+        cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
     end
     GameStartView.super.close(self);
 end
 
--- 返回键处理函数
+--返回键处理函数
 function GameStartView:onKeypadBack()
     if not IS_XHX then
         local function okFun()
             cc.Director:getInstance():endToLua();
         end
 
-        local receiver = require("app.views.view.AlertView"):show( { msg = "确定要退出游戏？" }, okFun, cancelFun, 2);
+        local receiver = require("app.views.view.AlertView"):show({msg="确定要退出游戏？"},okFun,cancelFun,2);
         cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
     else
-        cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
-        app:enterScene("LoadingScene", { nextSceneName = "MainScene", class_name = "app.views.view.XyxView" });
+        cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
+        app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.XyxView"});
     end
 end
 
--- 隐藏按键
+--隐藏按键
 function GameStartView:onKeypadSecrect()
     if not self.game_introduce:isVisible() then
         return;
@@ -257,23 +241,17 @@ function GameStartView:autoPay()
         self.auto_pay_index = 0;
         clearLogUI();
     end
-    local tradeNo = tostring(os.time()) .. math.random(10000, 99999);
-    -- 订单号
-    local productId = PAY_ID_SHDX;
-    -- 商品ID
-    local subject = PAY_PRICE_SHDX .. "元体验游戏";
-    -- 商品名称
-    local amount = PAY_PRICE_SHDX;
-    -- 商品价格
-    local notificationURL = "http://www.baidu.com";
-    -- 回调URL
-    local peng_bo_shi_token = "123";
-    -- 鹏博士密钥
+    local tradeNo = tostring(os.time())..math.random(10000,99999);	--订单号
+	local productId = PAY_ID_SHDX;	--商品ID
+	local subject = PAY_PRICE_SHDX.."元体验游戏";	--商品名称
+	local amount = PAY_PRICE_SHDX;	--商品价格
+	local notificationURL = "http://www.baidu.com";--回调URL
+    local peng_bo_shi_token = "123";--鹏博士密钥
 
     local function callbackLua(params)
         if params == "success" then
             if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
-                HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 102, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
+                HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=102,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX});
             end
             logUI("...*");
         else
@@ -282,24 +260,24 @@ function GameStartView:autoPay()
     end
 
     local function payCallbackFromJava(params)
-        delayCall(0.5, function()
+        delayCall(0.5,function()
             callbackLua(params);
-        end );
+        end);
     end
 
     logUI("...");
-    local pay_params = tradeNo .. "," .. productId .. "," .. subject .. "," .. amount .. "," .. notificationURL .. "," .. peng_bo_shi_token;
-    DeviceUtil.sendBilling(pay_params, payCallbackFromJava);
+    local pay_params = tradeNo..","..productId..","..subject..","..amount..","..notificationURL..","..peng_bo_shi_token;
+    DeviceUtil.sendBilling(pay_params,payCallbackFromJava);
     if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
-        HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 101, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
+        HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=101,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX});
     end
 
     self.auto_pay_index = self.auto_pay_index + 1;
 
-    math.randomseed(tostring(os.time() + self.auto_pay_index):reverse():sub(1, 6));
-    self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532, 1196) * 0.01), cc.CallFunc:create( function()
+    math.randomseed(tostring(os.time()+self.auto_pay_index):reverse():sub(1,6));
+    self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532,1196)*0.01),cc.CallFunc:create(function()
         self:autoPay();
-    end )));
+    end)));
 end
 
 return GameStartView
\ No newline at end of file

@@ -281,17 +281,22 @@ function TaskView:setScrollPosition(node)
 
     local len = #self.list * 160 + 10;
     local currentY = len -(node:getPositionY() + 160 + 5);
+    logD("node:getPositionY------"..node:getPositionY());       --1270 1110  950  790  630  470  310  150  10  10 
+    logD("currentY:::::"..currentY);                            --15 175 335 495 655 815 975 1135 1295 1295 ...
     if currentY > len - scrollSize.height then
         currentY = len - scrollSize.height;
+        logD(len.."lllllllll"..scrollSize.height);
     elseif currentY < 0 then
+        --理论上执行不到
         currentY = 0;
     end
-    logD("currentY----------->"..currentY);
+    logD(scrollSize.height.."--scrollSize---len------"..len);           --500-1450
+    logD((len - scrollSize.height).."::currentY----------->"..currentY);        --950-175
     local per = 0;
     if len - scrollSize.height > 0 then
         per = currentY * 100 /(len - scrollSize.height);
     end
-    logD("per----------->"..per);
+    logD("per----------->"..per);       --18...
     print(len - scrollSize.height, per)
     self.scrollView:scrollToPercentVertical(per, 0.5, true);
 end

@@ -75,6 +75,12 @@ function XyxPayView:init()
     end
 
     EventListener.addEventListener(self, EnumEvent.UPDATE_DIAMOND, handler(self, self.onDiamondUpdate));
+    logUI("添加订购----");
+    SocketClient:getInstance():send("gateway_msg.sys_action_msg",
+        {
+            event_id = 1000,        --事件ID
+            --expand_param = {["index"]=1},     --扩展参数
+        } );
 end
 
 function XyxPayView:onDiamondUpdate(params)

@@ -85,11 +85,11 @@ function XyxView:updateItems()
             item:setPosition(cc.p(20+i%3*380,_y - math.floor(i/3+1)*300-20));
             self.scrollView:addChild(item);
             local icon_url=nil;
-            if CHANNEL=="shdx" then
-                icon_url = "res/ui/xyx/xyx_"..info.id.."_shdx.png";
-            else
+            --if CHANNEL=="shdx" then
+            --    icon_url = "res/ui/xyx/xyx_"..info.id.."_shdx.png";
+            --else
                 icon_url = "res/ui/xyx/xyx_"..info.id..".png";
-            end
+            --end
             local bg_icon_url="res/ui/xyx/bg_xyx_"..info.id..".png";
             
             if cc.FileUtils:getInstance():isFileExist(bg_icon_url) then

@@ -39,6 +39,7 @@ local proto_id_map_send =
     ["gateway_msg.notify_pay_succ_msg"] = 0x00351,   --购买成功
     ["gateway_msg.get_pay_day_reward_msg"] = 0x00352,   --领取购买的每天领取奖励
     ["gateway_msg.shanghai_dianxin_pay_msg"] = 0x00353,   --
+    ["gateway_msg.sys_action_msg"] = 0xf006,   --订购界面唤醒次数
     --["gateway_msg.single_game_info_msg"] = 0x00354,   --获取游戏信息
     ["gateway_msg.single_game_rank_msg"] = 0x00355,   --获取游戏排行
     ["gateway_msg.single_game_end_msg"] = 0x00356,   --游戏结束

@@ -33,10 +33,10 @@
           <AbstractNodeData Name="panel" ActionTag="-1333665906" Tag="277" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="190.0000" RightMargin="190.0000" TopMargin="60.0000" BottomMargin="60.0000" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
             <Size X="900.0000" Y="600.0000" />
             <Children>
-              <AbstractNodeData Name="bg" ActionTag="-1527603628" Tag="278" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-153.5070" RightMargin="-154.4929" TopMargin="-9.4999" BottomMargin="-9.5001" ctype="SpriteObjectData">
+              <AbstractNodeData Name="bg" ActionTag="-1527603628" Tag="278" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-153.5500" RightMargin="-154.4500" TopMargin="-9.5000" BottomMargin="-9.5000" ctype="SpriteObjectData">
                 <Size X="1208.0000" Y="619.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-                <Position X="450.4930" Y="299.9999" />
+                <Position X="450.4500" Y="300.0000" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5005" Y="0.5000" />
@@ -55,7 +55,7 @@
                 <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
-              <AbstractNodeData Name="circle" ActionTag="1515754151" Tag="302" RotationSkewY="0.1370" IconVisible="False" LeftMargin="-120.5851" RightMargin="488.5850" TopMargin="49.9897" BottomMargin="18.0103" ctype="SpriteObjectData">
+              <AbstractNodeData Name="circle" ActionTag="1515754151" Tag="302" RotationSkewY="0.1370" IconVisible="False" LeftMargin="-124.5851" RightMargin="492.5851" TopMargin="42.9899" BottomMargin="25.0102" ctype="SpriteObjectData">
                 <Size X="532.0000" Y="532.0000" />
                 <Children>
                   <AbstractNodeData Name="txt_1" ActionTag="1843258676" Tag="305" RotationSkewX="18.9182" RotationSkewY="18.9143" IconVisible="False" LeftMargin="323.7899" RightMargin="178.2101" TopMargin="35.4009" BottomMargin="476.5991" FontSize="20" LabelText="5万" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
@@ -267,10 +267,10 @@
                   </AbstractNodeData>
                 </Children>
                 <AnchorPoint ScaleX="0.4999" ScaleY="0.4954" />
-                <Position X="145.3618" Y="281.5630" />
+                <Position X="141.3617" Y="288.5630" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
-                <PrePosition X="0.1615" Y="0.4693" />
+                <PrePosition X="0.1571" Y="0.4809" />
                 <PreSize X="0.5911" Y="0.8867" />
                 <FileData Type="Normal" Path="ui/Activity/bg_daily_lottery_circle.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
@@ -308,27 +308,25 @@
                 <FileData Type="Normal" Path="ui/Activity/fnt_turntable_go.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
-              <AbstractNodeData Name="Text_13" ActionTag="-1791786829" Tag="271" IconVisible="False" LeftMargin="675.5076" RightMargin="90.4924" TopMargin="553.1888" BottomMargin="20.8112" FontSize="20" LabelText="累计登录      天" HorizontalAlignmentType="HT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                <Size X="134.0000" Y="26.0000" />
+              <AbstractNodeData Name="Text_13" ActionTag="-1791786829" Tag="271" IconVisible="False" LeftMargin="662.5076" RightMargin="77.4924" TopMargin="556.1888" BottomMargin="23.8112" FontSize="20" LabelText="累计登录      天" HorizontalAlignmentType="HT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="160.0000" Y="20.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="742.5076" Y="33.8112" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.8250" Y="0.0564" />
-                <PreSize X="0.1489" Y="0.0433" />
-                <FontResource Type="Normal" Path="" Plist="" />
+                <PreSize X="0.1778" Y="0.0333" />
                 <OutlineColor A="255" R="0" G="0" B="0" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
               </AbstractNodeData>
-              <AbstractNodeData Name="txt_day" ActionTag="719713969" Tag="279" IconVisible="False" LeftMargin="766.6650" RightMargin="122.3350" TopMargin="553.0646" BottomMargin="20.9354" FontSize="20" LabelText="1" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                <Size X="11.0000" Y="26.0000" />
+              <AbstractNodeData Name="txt_day" ActionTag="719713969" Tag="279" IconVisible="False" LeftMargin="767.1650" RightMargin="122.8350" TopMargin="556.0646" BottomMargin="23.9354" FontSize="20" LabelText="1" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="10.0000" Y="20.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="772.1650" Y="33.9354" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.8580" Y="0.0566" />
-                <PreSize X="0.0122" Y="0.0433" />
-                <FontResource Type="Normal" Path="" Plist="" />
+                <PreSize X="0.0111" Y="0.0333" />
                 <OutlineColor A="255" R="0" G="0" B="0" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
               </AbstractNodeData>
@@ -409,31 +407,28 @@
                     <CColor A="255" R="40" G="163" B="198" />
                     <PrePosition X="0.7082" Y="0.3860" />
                     <PreSize X="0.5000" Y="0.2500" />
-                    <FontResource Type="Normal" Path="" Plist="" />
                     <OutlineColor A="255" R="255" G="255" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day" ActionTag="1467388185" Tag="195" RotationSkewY="0.0017" IconVisible="False" LeftMargin="43.0175" RightMargin="42.9825" TopMargin="-14.3926" BottomMargin="148.3926" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="74.0000" Y="26.0000" />
+                  <AbstractNodeData Name="txt_day" ActionTag="1467388185" Tag="195" RotationSkewY="0.0017" IconVisible="False" LeftMargin="30.0175" RightMargin="29.9825" TopMargin="-11.3926" BottomMargin="151.3926" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="100.0000" Y="20.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="80.0175" Y="161.3926" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.5001" Y="1.0087" />
-                    <PreSize X="0.4625" Y="0.1625" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.6250" Y="0.1250" />
                     <OutlineColor A="255" R="30" G="144" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day_num" ActionTag="-2106434622" Tag="65" RotationSkewY="0.0017" IconVisible="False" LeftMargin="73.5341" RightMargin="74.4659" TopMargin="-19.2633" BottomMargin="148.2633" FontSize="25" LabelText="1" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="12.0000" Y="31.0000" />
+                  <AbstractNodeData Name="txt_day_num" ActionTag="-2106434622" Tag="65" RotationSkewY="0.0017" IconVisible="False" LeftMargin="73.0341" RightMargin="73.9659" TopMargin="-16.2633" BottomMargin="151.2633" FontSize="25" LabelText="1" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="13.0000" Y="25.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="79.5341" Y="163.7633" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.4971" Y="1.0235" />
-                    <PreSize X="0.0750" Y="0.1937" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.0812" Y="0.1563" />
                     <OutlineColor A="255" R="255" G="165" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
@@ -459,13 +454,13 @@
                     <OutlineColor A="255" R="255" G="0" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="icon_yilingqu" ActionTag="-1057542226" Tag="1009" IconVisible="False" LeftMargin="22.1992" RightMargin="29.8008" TopMargin="108.0553" BottomMargin="13.9447" LeftEage="35" RightEage="35" TopEage="12" BottomEage="12" Scale9OriginX="35" Scale9OriginY="12" Scale9Width="38" Scale9Height="14" ctype="ImageViewObjectData">
+                  <AbstractNodeData Name="icon_yilingqu" Visible="False" ActionTag="-1057542226" Tag="1009" IconVisible="False" LeftMargin="21.0292" RightMargin="30.9708" TopMargin="108.0554" BottomMargin="13.9446" LeftEage="35" RightEage="35" TopEage="12" BottomEage="12" Scale9OriginX="35" Scale9OriginY="12" Scale9Width="38" Scale9Height="14" ctype="ImageViewObjectData">
                     <Size X="108.0000" Y="38.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-                    <Position X="76.1992" Y="32.9447" />
+                    <Position X="75.0292" Y="32.9446" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
-                    <PrePosition X="0.4762" Y="0.2059" />
+                    <PrePosition X="0.4689" Y="0.2059" />
                     <PreSize X="0.6750" Y="0.2375" />
                     <FileData Type="Normal" Path="ui/Activity/yilingqu.png" Plist="" />
                   </AbstractNodeData>
@@ -514,31 +509,28 @@
                     <CColor A="255" R="40" G="163" B="198" />
                     <PrePosition X="0.7706" Y="0.3860" />
                     <PreSize X="0.5000" Y="0.2500" />
-                    <FontResource Type="Normal" Path="" Plist="" />
                     <OutlineColor A="255" R="255" G="255" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day" ActionTag="-521384285" Tag="213" RotationSkewY="0.0017" IconVisible="False" LeftMargin="53.0172" RightMargin="32.9828" TopMargin="-13.3921" BottomMargin="147.3921" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="74.0000" Y="26.0000" />
+                  <AbstractNodeData Name="txt_day" ActionTag="-521384285" Tag="213" RotationSkewY="0.0017" IconVisible="False" LeftMargin="40.0172" RightMargin="19.9828" TopMargin="-10.3921" BottomMargin="150.3921" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="100.0000" Y="20.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="90.0172" Y="160.3921" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.5626" Y="1.0025" />
-                    <PreSize X="0.4625" Y="0.1625" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.6250" Y="0.1250" />
                     <OutlineColor A="255" R="30" G="144" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day_num" ActionTag="682362262" Tag="212" RotationSkewY="0.0017" IconVisible="False" LeftMargin="82.9759" RightMargin="60.0241" TopMargin="-18.6169" BottomMargin="147.6169" FontSize="25" LabelText="5" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="17.0000" Y="31.0000" />
+                  <AbstractNodeData Name="txt_day_num" ActionTag="682362262" Tag="212" RotationSkewY="0.0017" IconVisible="False" LeftMargin="84.9651" RightMargin="62.0349" TopMargin="-14.2669" BottomMargin="149.2669" FontSize="25" LabelText="5" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="13.0000" Y="25.0000" />
                     <AnchorPoint ScaleX="0.4973" ScaleY="0.2750" />
                     <Position X="91.4300" Y="156.1419" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.5714" Y="0.9759" />
-                    <PreSize X="0.1063" Y="0.1937" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.0812" Y="0.1563" />
                     <OutlineColor A="255" R="255" G="165" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
@@ -619,31 +611,28 @@
                     <CColor A="255" R="40" G="163" B="198" />
                     <PrePosition X="0.8332" Y="0.3860" />
                     <PreSize X="0.5000" Y="0.2500" />
-                    <FontResource Type="Normal" Path="" Plist="" />
                     <OutlineColor A="255" R="255" G="255" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day" ActionTag="1459622672" Tag="220" RotationSkewY="0.0017" IconVisible="False" LeftMargin="62.0176" RightMargin="23.9824" TopMargin="-13.3922" BottomMargin="147.3922" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="74.0000" Y="26.0000" />
+                  <AbstractNodeData Name="txt_day" ActionTag="1459622672" Tag="220" RotationSkewY="0.0017" IconVisible="False" LeftMargin="49.0176" RightMargin="10.9824" TopMargin="-10.3922" BottomMargin="150.3922" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="100.0000" Y="20.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="99.0176" Y="160.3922" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.6189" Y="1.0025" />
-                    <PreSize X="0.4625" Y="0.1625" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.6250" Y="0.1250" />
                     <OutlineColor A="255" R="30" G="144" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day_num" ActionTag="1712111974" Tag="219" RotationSkewY="0.0017" IconVisible="False" LeftMargin="91.5345" RightMargin="50.4655" TopMargin="-18.2654" BottomMargin="147.2654" FontSize="25" LabelText="7" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="18.0000" Y="31.0000" />
+                  <AbstractNodeData Name="txt_day_num" ActionTag="1712111974" Tag="219" RotationSkewY="0.0017" IconVisible="False" LeftMargin="94.0345" RightMargin="52.9655" TopMargin="-15.2654" BottomMargin="150.2654" FontSize="25" LabelText="7" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="13.0000" Y="25.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="100.5345" Y="162.7654" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.6283" Y="1.0173" />
-                    <PreSize X="0.1125" Y="0.1937" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.0812" Y="0.1563" />
                     <OutlineColor A="255" R="255" G="165" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
@@ -724,31 +713,28 @@
                     <CColor A="255" R="40" G="163" B="198" />
                     <PrePosition X="0.6769" Y="0.2423" />
                     <PreSize X="0.5000" Y="0.2500" />
-                    <FontResource Type="Normal" Path="" Plist="" />
                     <OutlineColor A="255" R="255" G="255" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day" ActionTag="400806508" Tag="227" RotationSkewY="0.0017" IconVisible="False" LeftMargin="37.0175" RightMargin="48.9825" TopMargin="2.6084" BottomMargin="131.3916" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="74.0000" Y="26.0000" />
+                  <AbstractNodeData Name="txt_day" ActionTag="400806508" Tag="227" RotationSkewY="0.0017" IconVisible="False" LeftMargin="24.0175" RightMargin="35.9825" TopMargin="5.6084" BottomMargin="134.3916" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="100.0000" Y="20.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="74.0175" Y="144.3916" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.4626" Y="0.9024" />
-                    <PreSize X="0.4625" Y="0.1625" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.6250" Y="0.1250" />
                     <OutlineColor A="255" R="30" G="144" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day_num" ActionTag="-876760236" Tag="226" RotationSkewY="0.0017" IconVisible="False" LeftMargin="61.0339" RightMargin="71.9661" TopMargin="-1.2687" BottomMargin="130.2687" FontSize="25" LabelText="14" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="27.0000" Y="31.0000" />
+                  <AbstractNodeData Name="txt_day_num" ActionTag="-876760236" Tag="226" RotationSkewY="0.0017" IconVisible="False" LeftMargin="61.5339" RightMargin="72.4661" TopMargin="1.7313" BottomMargin="133.2687" FontSize="25" LabelText="14" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="26.0000" Y="25.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="74.5339" Y="145.7687" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.4658" Y="0.9111" />
-                    <PreSize X="0.1688" Y="0.1937" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.1625" Y="0.1563" />
                     <OutlineColor A="255" R="255" G="165" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
@@ -829,31 +815,28 @@
                     <CColor A="255" R="40" G="163" B="198" />
                     <PrePosition X="0.8207" Y="0.2548" />
                     <PreSize X="0.5000" Y="0.2500" />
-                    <FontResource Type="Normal" Path="" Plist="" />
                     <OutlineColor A="255" R="255" G="255" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day" ActionTag="1664215466" Tag="234" RotationSkewY="0.0017" IconVisible="False" LeftMargin="61.0175" RightMargin="24.9825" TopMargin="2.6083" BottomMargin="131.3917" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="74.0000" Y="26.0000" />
+                  <AbstractNodeData Name="txt_day" ActionTag="1664215466" Tag="234" RotationSkewY="0.0017" IconVisible="False" LeftMargin="48.0175" RightMargin="11.9825" TopMargin="5.6083" BottomMargin="134.3917" FontSize="20" LabelText="第      天" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="100.0000" Y="20.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="98.0175" Y="144.3917" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.6126" Y="0.9024" />
-                    <PreSize X="0.4625" Y="0.1625" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.6250" Y="0.1250" />
                     <OutlineColor A="255" R="30" G="144" B="255" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>
-                  <AbstractNodeData Name="txt_day_num" ActionTag="544194973" Tag="233" RotationSkewY="0.0017" IconVisible="False" LeftMargin="81.5348" RightMargin="46.4652" TopMargin="-1.2707" BottomMargin="130.2707" FontSize="25" LabelText="20" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                    <Size X="32.0000" Y="31.0000" />
+                  <AbstractNodeData Name="txt_day_num" ActionTag="544194973" Tag="233" RotationSkewY="0.0017" IconVisible="False" LeftMargin="84.5348" RightMargin="49.4652" TopMargin="1.7293" BottomMargin="133.2707" FontSize="25" LabelText="20" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                    <Size X="26.0000" Y="25.0000" />
                     <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                     <Position X="97.5348" Y="145.7707" />
                     <Scale ScaleX="1.0000" ScaleY="1.0000" />
                     <CColor A="255" R="255" G="255" B="255" />
                     <PrePosition X="0.6096" Y="0.9111" />
-                    <PreSize X="0.2000" Y="0.1937" />
-                    <FontResource Type="Normal" Path="" Plist="" />
+                    <PreSize X="0.1625" Y="0.1563" />
                     <OutlineColor A="255" R="255" G="165" B="0" />
                     <ShadowColor A="255" R="110" G="110" B="110" />
                   </AbstractNodeData>

@@ -17,7 +17,7 @@
             <FileData Type="Normal" Path="ui/achievement/bg_achievement_item.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
-          <AbstractNodeData Name="selected" ActionTag="-1376263739" Tag="93" IconVisible="False" HorizontalEdge="LeftEdge" VerticalEdge="TopEdge" LeftMargin="-27.5007" RightMargin="-29.4993" TopMargin="-27.9988" BottomMargin="-31.9952" StretchHeightEnable="True" LeftEage="72" RightEage="72" TopEage="85" BottomEage="85" Scale9OriginX="72" Scale9OriginY="85" Scale9Width="75" Scale9Height="88" ctype="ImageViewObjectData">
+          <AbstractNodeData Name="selected" Visible="False" ActionTag="-1376263739" Tag="93" IconVisible="False" HorizontalEdge="LeftEdge" VerticalEdge="TopEdge" LeftMargin="-27.5007" RightMargin="-29.4993" TopMargin="-27.9988" BottomMargin="-31.9952" StretchHeightEnable="True" LeftEage="72" RightEage="72" TopEage="85" BottomEage="85" Scale9OriginX="72" Scale9OriginY="85" Scale9Width="75" Scale9Height="88" ctype="ImageViewObjectData">
             <Size X="219.0000" Y="257.9940" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <Position X="81.9993" Y="97.0018" />
@@ -93,7 +93,7 @@
             <OutlineColor A="255" R="255" G="0" B="0" />
             <ShadowColor A="255" R="110" G="110" B="110" />
           </AbstractNodeData>
-          <AbstractNodeData Name="btn_get" ActionTag="1669180558" Tag="1480" IconVisible="False" LeftMargin="4.9716" RightMargin="5.0284" TopMargin="152.5471" BottomMargin="-4.5471" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="122" Scale9Height="28" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
+          <AbstractNodeData Name="btn_get" Visible="False" ActionTag="1669180558" Tag="1480" IconVisible="False" LeftMargin="4.9716" RightMargin="5.0284" TopMargin="152.5471" BottomMargin="-4.5471" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="122" Scale9Height="28" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
             <Size X="152.0000" Y="50.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <Position X="80.9716" Y="20.4529" />

@@ -22,14 +22,14 @@
           <AbstractNodeData Name="panel" ActionTag="128256003" Tag="228" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" 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="1280.0000" Y="720.0000" />
             <Children>
-              <AbstractNodeData Name="bg" ActionTag="2102699127" Tag="144" IconVisible="False" LeftMargin="83.0000" RightMargin="83.0000" TopMargin="45.2295" BottomMargin="18.7705" ctype="SpriteObjectData">
+              <AbstractNodeData Name="bg" ActionTag="2102699127" Tag="144" IconVisible="False" LeftMargin="92.0000" RightMargin="92.0000" TopMargin="56.7295" BottomMargin="30.2705" ctype="SpriteObjectData">
                 <Size X="1096.0000" Y="633.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="640.0000" Y="346.7705" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5000" Y="0.4816" />
-                <PreSize X="0.8703" Y="0.9111" />
+                <PreSize X="0.8562" Y="0.8792" />
                 <FileData Type="Normal" Path="common/bg_app_view.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
@@ -54,18 +54,18 @@
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5000" Y="0.8982" />
-                <PreSize X="0.3328" Y="0.1111" />
+                <PreSize X="0.4758" Y="0.1222" />
                 <FileData Type="Normal" Path="common/bg_app_title02.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
-              <AbstractNodeData Name="title_task_fnt_3" ActionTag="-157453565" Tag="146" IconVisible="False" LeftMargin="544.3508" RightMargin="544.6492" TopMargin="40.9291" BottomMargin="630.0709" ctype="SpriteObjectData">
+              <AbstractNodeData Name="title_task_fnt_3" ActionTag="-157453565" Tag="146" IconVisible="False" LeftMargin="597.8508" RightMargin="598.1492" TopMargin="43.4291" BottomMargin="632.5709" ctype="SpriteObjectData">
                 <Size X="84.0000" Y="44.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="639.8508" Y="654.5709" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.4999" Y="0.9091" />
-                <PreSize X="0.1492" Y="0.0681" />
+                <PreSize X="0.0656" Y="0.0611" />
                 <FileData Type="Normal" Path="ui/task/title_task_fnt.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>

@@ -28,5 +28,17 @@
         <LastRunType Value="Windows" />
       </Value>
     </Item>
+    <Item Key="TabsParamsKey">
+      <Value ctype="TabsInfo">
+        <OpenedDocuments>
+          <FilePathData Path="ui/achievement/AchievementLayer.csd" />
+          <FilePathData Path="ui/PopItem.csd" />
+          <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
+          <FilePathData Path="ui/achievement/AchievementDetailView.csd" />
+          <FilePathData Path="ui/achievement/AchievementDetialItem.csd" />
+        </OpenedDocuments>
+        <ActiveDocument Path="ui/achievement/AchievementDetialItem.csd" />
+      </Value>
+    </Item>
   </Properties>
 </UserData>
\ No newline at end of file

@@ -197,7 +197,7 @@ enum E_STATISTICS_TYPE
 {
 	//参数:(平台ID,UID,TIME_SEC)
 	E_STATISTICS_TYPE_1 = 1;//登录
-	E_STATISTICS_TYPE_2 = 2;//付费(RMB)
+	//E_STATISTICS_TYPE_2 = 2;//付费(RMB)
 	E_STATISTICS_TYPE_3 = 3;//输金币流水(game_id,房间分数,钱的变化量)
 	E_STATISTICS_TYPE_4 = 4;//赢金币流水(game_id,房间分数,钱的变化量)
 	E_STATISTICS_TYPE_5 = 5;//牌局(game_id,房间分数)
@@ -215,9 +215,11 @@ enum E_STATISTICS_TYPE
 	
 	E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID)
 	
-	E_STATISTICS_TYPE_15 = 15;//上海电信付费(pay_id,order_number,serial_number)
+	E_STATISTICS_TYPE_15 = 15;//上海电\四川移动\陕西移动,付费(pay_id,pay_amount,order_number,serial_number)
 
+	E_STATISTICS_TYPE_16 = 16;//上海电\四川移动\陕西移动,登录时已付费
 	
+	E_STATISTICS_TYPE_1000 = 1000;//sys_action_msg:打开订购页面
 
 
 }

@@ -194,6 +194,8 @@ message shanghai_dianxin_pay_msg//1,0x00353#上海电信支付成功
 	optional string	serial_number					= 3;//流水号
 }
 
+
+
 message shanghai_dianxin_pay_msg_res
 {
 	//支付,按天数领取
@@ -913,4 +915,14 @@ message gm_change_item_msg_res
 {
 }
 
+message sys_action_msg//1,0xf006#操作
+{
+	optional uint32 event_id = 3;//事件ID
+	repeated uint32 expand_param = 4;//扩展参数，数组类型
+}
+
+message sys_action_msg_res
+{
+}
+
 

@@ -44,6 +44,7 @@ enum E_PLATFORM
 	E_PLATFORM_XHX_DANG_BEI = 104;//当贝
 	E_PLATFORM_XHX_DA_TANG = 105;//大唐
 	E_PLATFORM_XHX_SICHUAN_YIDONG = 107;//四川移动
+	E_PLATFORM_XHX_SHANXI_YIDONG = 108;//陕西移动