0821

@@ -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>1070100010142857</uid>
+    <uid>1060100010142873</uid>
     <is_bird_game_guide>1</is_bird_game_guide>
     <bird_best>1107</bird_best>
     <is_haidao_game_guide>1</is_haidao_game_guide>

+xcopy %cd%\res D:\AndroidProject\XhxAndroid_sxyd\assets\res  /E/I/Y
+cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_sxyd\assets\src -e -k tpdrawgdanjue -b tpdrawgd
+
+call xcopy %cd%\src D:\AndroidProject\XhxAndroid_sxyd\assets\src  /E/I/Y
\ No newline at end of file

@@ -45,10 +45,10 @@
 	</platform>
 	<!--上海电信-->
 	<platform id="106" channel="shdx">
-		<pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="69.0" product="1000710508" productPuTao="qjqp201"  notice="1"/>
-		<pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" item_ext="200001,689;200002,200;200003,100;200004,10;200005,1" payitem=""  rmb="299.0" product="1000710226" productPuTao="qjqp202"  notice="1"/>
-		<pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="49.0" product="1000709506" productPuTao="qjqp999"  notice="1"/>
-		<pay id="302" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="39.0" product="1000710713" productPuTao="qjqp999"  notice="1"/>
+		<pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="69.00" product="1000710508" productPuTao="qjqp201"  notice="1"/>
+		<pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" item_ext="200001,689;200002,200;200003,100;200004,10;200005,1" payitem=""  rmb="299.00" product="1000710226" productPuTao="qjqp202"  notice="1"/>
+		<pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="49.00" product="1000709506" productPuTao="qjqp999"  notice="1"/>
+		<pay id="302" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="39.00" product="1000710713" productPuTao="qjqp999"  notice="1"/>
 	</platform>	
 	<!--四川移动-->
 	<platform id="107" channel="scyd">

@@ -18,7 +18,12 @@ local function showPopItem()
             local rect = PopItem:getBoundingBox();
             PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
             local icon = PopItem:getChildByName("icon");
+            if CHANNEL=="shdx" and tonumber(obj.id)==100001 then
+                icon:loadTexture("res/icon/1000011.png");
+            else
                 icon:loadTexture("res/icon/"..obj.id..".png");
+            end
+            
             local item_amount = PopItem:getChildByName("item_amount");
             local itemInfo = ItemInfo.getItemInfo(obj.id);
             item_amount:setString(itemInfo.name.."* "..obj.num);

@@ -1061,7 +1061,7 @@ function UserModel.getLeftVipDay()
         end
     end
 
-    if CHANNEL == "gzdt" then
+    if CHANNEL == "gzdt" or CHANNEL=="sxyd" then
         -- 大唐版本所有的用户都是VIP
         left_day_num = 100;
     end

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

@@ -164,8 +164,8 @@ function GameStartView:onStart()
         if UserModel.getLeftVipDay() == 0 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
-                logUI("每天免费玩一次");
                 local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
                 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
                 paySuccessFun();

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

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

@@ -75,6 +75,7 @@ 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;

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

@@ -84,6 +84,8 @@ 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");
 

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

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

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

@@ -32,6 +32,10 @@ function LoadingScene:onCreate()
     self.ui = cc.CSLoader:createNode("ui/LoadingScene.csb");
     self:addChild(self.ui);
 
+    if CHANNEL=="shdx" then
+        self.ui:getChildByName("logo_game"):setSpriteFrame(cc.Sprite:create("res/common/logo_game_shdx.png"):getSpriteFrame());
+    end
+
     self.ui:setContentSize(cc.size(display.width,display.height));
     ccui.Helper:doLayout(self.ui);
 

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

@@ -113,7 +113,7 @@ function AchievementView:updateItems()
     local list_nodes = { };
     local _list = AchievementInfo.getAchievementList();
 
-     if CHANNEL=="gzdt" then       --支付模式去掉钻石积累
+     if CHANNEL=="gzdt" or CHANNEL=="sxyd" then       --支付模式去掉钻石积累
         for i =1,#_list do
             if _list[i] and _list[i].viewid==5 then
                 table.remove(_list,i);
@@ -127,7 +127,7 @@ function AchievementView:updateItems()
         end
     end
 
-    if CHANNEL=="shdx" or CHANNEL=="scyd" then       --上海电信没有大富豪
+    if CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then       --上海电信没有大富豪
         for i =1,#_list do
             if _list[i] and _list[i].viewid==5 then
                 table.remove(_list,i);
@@ -340,7 +340,7 @@ function AchievementView:setScrollPosition(node)
 
     local _list = AchievementInfo.getAchievementList();
 
-    if CHANNEL=="gzdt" then       --支付模式去掉钻石积累
+    if CHANNEL=="gzdt" or CHANNEL=="sxyd" then       --支付模式去掉钻石积累
         for i =1,#_list do
             if _list[i] and _list[i].viewid==5 then
                 table.remove(_list,i);

@@ -120,7 +120,7 @@ function ActivityView:initActivity()
                 end
             end
         elseif v.act == "ActivityVipView" then
-            if CHANNEL=="gzdt" or #vipList<=0 then  --0支付模式不能访问活动礼包
+            if CHANNEL=="gzdt" or CHANNEL=="sxyd" or #vipList<=0 then  --0支付模式不能访问活动礼包
                                                 --活动礼包先判断有没有数据 
             else      
                act_tab_list[#act_tab_list+1] = v;

@@ -38,6 +38,9 @@ function LoginView:init()
 --    logUI("本地openid："..self.openid);
 --    logUI("本地access_token："..self.access_token);
 --    logUI("本地refresh_token："..self.refresh_token);
+    if CHANNEL=="shdx" then
+        self:getChildByName("panel"):getChildByName("logo_game"):setSpriteFrame(cc.Sprite:create("res/common/logo_game_shdx.png"):getSpriteFrame());
+    end
 
     self.userID = cc.UserDefault:getInstance():getStringForKey("Account");
 
@@ -64,7 +67,7 @@ function LoginView:init()
     local isUseWxLogin = true;
     local targetPlatform = cc.Application:getInstance():getTargetPlatform();
     --检测到cucc渠道、电脑平台时自动点击游客登录模式
-    if not isUseWxLogin or CHANNEL == "cucc" or CHANNEL == "shdx" or CHANNEL == "gzdt" or CHANNEL == "scyd" or targetPlatform == cc.PLATFORM_OS_WINDOWS or targetPlatform == cc.PLATFORM_OS_MAC then
+    if not isUseWxLogin or CHANNEL == "cucc" or CHANNEL == "shdx" or CHANNEL == "gzdt" or CHANNEL == "scyd" or CHANNEL == "sxyd" or targetPlatform == cc.PLATFORM_OS_WINDOWS or targetPlatform == cc.PLATFORM_OS_MAC then
         self:doLogin(self.userID);
     else
         if self.openid == "" or self.access_token == "" or self.refresh_token == "" then

@@ -85,7 +85,7 @@ function RoleBussinessView:init(_nodes, _update_nodes_func, _update_nodes_state_
     end
     -- logUI(shanchang_game.."---<RoleBussinessView --shanchanggame--------->"..ruoxiang_game);
     self.btn_wx = self:getChildByName("btn_wx");
-    if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" and CHANNEL~="scyd" then
+    if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" and CHANNEL~="scyd" and CHANNEL~="sxyd" then
         self.btn_wx.fn = function()
             self:onWxClick(self.btn_wx);
         end;
@@ -213,7 +213,7 @@ function RoleBussinessView:update()
         self.nodes = TableUtil.merge(self.nodes_copy, { _nodes });
     end
 
-    if CHANNEL=="gzdt" then
+    if CHANNEL=="gzdt" or CHANNEL=="sxyd" then
         self:getChildByName("txt_expire"):setVisible(false);
     end
 

@@ -189,7 +189,7 @@ function RoleDressView:update()
                 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/icon/default.png"):getSpriteFrame());
             end
             local itemInfo = ItemInfo.getItemInfo(item_id);
-            if itemInfo.vip == 1 and CHANNEL~="gzdt" then
+            if itemInfo.vip == 1 and CHANNEL~="gzdt" and CHANNEL~="sxyd" then
                 item:getChildByName("flag_vip"):setVisible(true);
             elseif itemInfo.vip == 1 and CHANNEL=="shdx" then
                 item:getChildByName("flag_vip"):setSpriteFrame(cc.Sprite:create("res/ui/shop/shop_textures_shdx.png"):getSpriteFrame());

@@ -40,7 +40,7 @@ function RoleMainView:init()
     self.nodes[2] = { };
     for i = 1, 5 do
         local tab = self:getChildByName("tab_" .. i);
-        if CHANNEL == "gzdt" and i == 5 then
+        if CHANNEL == "gzdt" or CHANNEL=="sxyd" and i == 5 then
             tab:setVisible(false);
         else
             if CHANNEL=="shdx" and i==5 then

@@ -152,7 +152,7 @@ function ShopExchangeView:onOkFn(ref)
         else
             --Alert.showTwo(strings.msg_1003,okFun);
 
-            if CHANNEL=="gzdt" or CHANNEL=="scyd" then
+            if CHANNEL=="gzdt" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
                     function okFun() end;
                     Alert.showTwo(strings.msg_1034,okFun);
                 else

@@ -70,8 +70,8 @@ function ShopView:init()
         local tab = self.panel:getChildByName("tab_"..i);
 
         --判断是否支持支付模式
-        if (CHANNEL=="gzdt" and i==5) or (CHANNEL=="gzdt" and i==6)or (CHANNEL=="shdx" and i==5) or (CHANNEL=="shdx" and i==6)
-            or (CHANNEL=="scyd" and i==5) or (CHANNEL=="scyd" and i==6) then    --隐藏金豆、钻石
+        if (CHANNEL=="gzdt" and i==5) or (CHANNEL=="gzdt" and i==6) or (CHANNEL=="shdx" and i==5) or (CHANNEL=="shdx" and i==6)
+            or (CHANNEL=="scyd" and i==5) or (CHANNEL=="scyd" and i==6)  or (CHANNEL=="sxyd" and i==5) or (CHANNEL=="sxyd" and i==6) then    --隐藏金豆、钻石
             tab:setVisible(false);  
         else
             tab:setTag(i);
@@ -96,7 +96,7 @@ function ShopView:init()
 
     self.nodesCopy = TableUtil.copyTab(self.nodes);
 
-    if CHANNEL=="gzdt" or CHANNEL=="shdx"  or CHANNEL=="scyd" then
+    if CHANNEL=="gzdt" or CHANNEL=="shdx"  or CHANNEL=="scyd" or CHANNEL=="sxyd" then
         self.panel:getChildByName("img_diamond"):setVisible(false);      
     end
 
@@ -294,7 +294,7 @@ function ShopView:update()
                 btn:show();
                 _nodes[1][#_nodes[1]+1] = btn;
             end
-            if itemInfo.vip == 1 and CHANNEL~="gzdt" then
+            if itemInfo.vip == 1 and CHANNEL~="gzdt" and CHANNEL~="sxyd" then
                 shopItem:getChildByName("flag_vip"):setVisible(true);
                 if CHANNEL=="shdx" then
                     shopItem:getChildByName("flag_vip"):setSpriteFrame(cc.Sprite:create("res/ui/shop/shop_textures_shdx.png"):getSpriteFrame());
@@ -381,7 +381,7 @@ function ShopView:onBuyClick(ref,event)
             if shopItemInfo.costList[1].id == 100000 then
                 Alert.showTwo(strings.msg_1032,okFun);
             else
-                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
+                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
                     function okFun() end;
                     Alert.showTwo(strings.msg_1034,okFun);
                 else
@@ -408,7 +408,7 @@ function ShopView:onBuyCallBack(params)
         if shopItemInfo.costList[1].id == 100000 then
             Alert.showTwo(strings.msg_1032,okFun);
         else
-                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
+                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
                     function okFun() end;
                     Alert.showTwo(strings.msg_1034,okFun);
                 else

@@ -49,7 +49,7 @@ function TaskView:update()
 
     self.list = UserModel.getTaskList();
 
-    if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then     --支付模式去除钻石任务
+    if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then     --支付模式去除钻石任务
         for i=0,#self.list-1 do
             if self.list[i + 1] and self.list[i + 1].id==10 then
                 table.remove(self.list,i+1);
@@ -188,7 +188,7 @@ function TaskView:onGetClick(ref, event)
                 UserModel.setTaskStep(currentTaskID, tonumber(currentStep.id));
                 self:update();
             end
-            print("领取任务奖励：" .. currentTaskID, currentStep.id)
+            print("领取任务奖励：" .. currentTaskID, currentStep.id);
             cmsg.on("gateway_msg.get_task_daily_reward_msg_res", getTaskDailyRewardRes);
             SocketClient:getInstance():send("gateway_msg.get_task_daily_reward_msg",
             {

@@ -5,6 +5,7 @@ function XyxGameOver:ctor()
 end
 
 function XyxGameOver:show(info,exitFun,againFun)
+    ItemManager.lock_pop = false;    --恢复弹窗
     local scene = cc.Director:getInstance():getRunningScene()
     local inst = XyxGameOver:create();
     scene:addChild(inst, dialog.ZORDER_POP);

@@ -107,7 +107,7 @@ function XyxView:updateItems()
                 item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
             end
 
-            if CHANNEL=="gzdt" then 
+            if CHANNEL=="gzdt" or CHANNEL=="sxyd" then 
                 item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
             end
 

@@ -133,7 +133,7 @@
             <EndColor A="255" R="255" G="255" B="255" />
             <ColorVector ScaleY="1.0000" />
           </AbstractNodeData>
-          <AbstractNodeData Name="logo_game_3" ActionTag="492850395" Tag="982" IconVisible="False" LeftMargin="331.4974" RightMargin="326.5026" TopMargin="45.4631" BottomMargin="448.5369" ctype="SpriteObjectData">
+          <AbstractNodeData Name="logo_game" ActionTag="492850395" Tag="982" IconVisible="False" LeftMargin="331.4974" RightMargin="326.5026" TopMargin="45.4631" BottomMargin="448.5369" ctype="SpriteObjectData">
             <Size X="622.0000" Y="226.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <Position X="642.4974" Y="561.5369" />

@@ -116,7 +116,7 @@
                 <OutlineColor A="255" R="255" G="0" B="0" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
               </AbstractNodeData>
-              <AbstractNodeData Name="logo_game_1" ActionTag="1864072629" Tag="981" IconVisible="False" LeftMargin="327.6240" RightMargin="330.3760" TopMargin="56.7587" BottomMargin="437.2413" ctype="SpriteObjectData">
+              <AbstractNodeData Name="logo_game" ActionTag="1864072629" Tag="981" IconVisible="False" LeftMargin="327.6240" RightMargin="330.3760" TopMargin="56.7587" BottomMargin="437.2413" ctype="SpriteObjectData">
                 <Size X="622.0000" Y="226.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="638.6240" Y="550.2413" />

@@ -33,8 +33,10 @@
         <OpenedDocuments>
           <FilePathData Path="ui/dress/BusinessView.csd" />
           <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
+          <FilePathData Path="ui/LoginLayer.csd" />
+          <FilePathData Path="ui/LoadingScene.csd" />
         </OpenedDocuments>
-        <ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
+        <ActiveDocument Path="ui/LoginLayer.csd" />
       </Value>
     </Item>
   </Properties>