0812

@@ -101,7 +101,7 @@ function LoadingScene:loadNextSceneResource()
         end
     end
 
-    ccs.ArmatureDataManager:getInstance():addArmatureFileInfoAsync(string.format("res/ui/rubbish/%s/%s.ExportJson","color_candy","color_candy"), handler(self, self.loadFileCallback));
+    --ccs.ArmatureDataManager:getInstance():addArmatureFileInfoAsync(string.format("res/ui/rubbish/%s/%s.ExportJson","color_candy","color_candy"), handler(self, self.loadFileCallback));
     
     local percent = 0;
     local function showProgressFun()

@@ -28,5 +28,19 @@
         <EnableHTML5Advanced Value="False" />
       </Value>
     </Item>
+    <Item Key="TabsParamsKey">
+      <Value ctype="TabsInfo">
+        <OpenedDocuments>
+          <FilePathData Path="ui/LoadingDataLayer.csd" />
+          <FilePathData Path="ui/rubbish/LoadingScene.csd" />
+          <FilePathData Path="ui/rubbish/GameStartLayer.csd" />
+          <FilePathData Path="ui/rubbish/GameScene.csd" />
+          <FilePathData Path="ui/rubbish/Rubbish.csd" />
+          <FilePathData Path="ui/rubbish/LevelPop.csd" />
+          <FilePathData Path="ui/AlertLayer.csd" />
+        </OpenedDocuments>
+        <ActiveDocument Path="ui/rubbish/LoadingScene.csd" />
+      </Value>
+    </Item>
   </Properties>
 </UserData>
\ No newline at end of file

@@ -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>1060100010142873</uid>
+    <uid>1070100010142857</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_scyd\assets\res  /E/I/Y
+cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_scyd\assets\src -e -k tpdrawgdanjue -b tpdrawgd
+
+call xcopy %cd%\src D:\AndroidProject\XhxAndroid_scyd\assets\src  /E/I/Y
\ No newline at end of file

@@ -50,7 +50,10 @@
 		<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"/>
 	</platform>	
-
+	<!--四川移动-->
+	<platform id="107" channel="scyd">
+		<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="28.0" product="1018000290" productPuTao="qjqp999"  notice="1"/>		
+	</platform>	
 </root>
 
 

@@ -127,7 +127,7 @@ function AchievementView:updateItems()
         end
     end
 
-    if CHANNEL=="shdx" then       --上海电信没有大富豪
+    if CHANNEL=="shdx" or CHANNEL=="scyd" then       --上海电信没有大富豪
         for i =1,#_list do
             if _list[i] and _list[i].viewid==5 then
                 table.remove(_list,i);
@@ -354,7 +354,7 @@ function AchievementView:setScrollPosition(node)
         end
     end
 
-    if CHANNEL=="shdx" then       --上海电信没有大富豪
+    if CHANNEL=="shdx" or CHANNEL=="scyd" then       --上海电信没有大富豪
         for i =1,#_list do
             if _list[i] and _list[i].viewid==5 then
                 table.remove(_list,i);

@@ -298,6 +298,8 @@ function ActivityView:updateTabState()
                     self.activity_content.act_view = require("app.views.view.ActivityVipView_tianjin_cucc"):create(handler(self,self.update_nodes));
                 elseif CHANNEL=="shdx" then
                     self.activity_content.act_view = require("app.views.view.ActivityVipView_shdx"):create(handler(self,self.update_nodes));
+                elseif CHANNEL=="scyd" then
+                    self.activity_content.act_view = require("app.views.view.ActivityVipView_scyd"):create(handler(self,self.update_nodes));
                 else
                     self.activity_content.act_view = require("app.views.view."..item.act):create(handler(self,self.update_nodes));
                 end

+local ActivityVipView = dialog.uinode("ui/Activity/tianjin_cucc/ActivityVip.csb", import(".BaseView"))
+
+-- 四川移动，只有续包月功能
+function ActivityVipView:ctor(_update_nodes_func)
+    ActivityVipView.super.ctor(self);
+
+    self.update_nodes_func = _update_nodes_func;
+end
+
+function ActivityVipView:init()
+    local _nodes = { };
+
+    local vipList = ShopInfo.getVipList();
+    -- （月卡，包年卡，包月卡）
+
+    self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
+    logD("vipList[3]--------------------->" .. #vipList);
+    if vipList[3] then
+        self.btn_vip_lianxu.id = vipList[3].id;
+        self.btn_vip_lianxu.fn = function()
+            self:onGetContinueClick(self.btn_vip_lianxu);
+        end
+        self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
+    end
+
+    self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
+    self.btn_lingqu_month.id = vipList[1].id;
+    self.btn_lingqu_month.fn = function()
+        self:onLingquClick(self.btn_lingqu_month);
+    end
+    self.btn_lingqu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
+
+    self.yilingqu_month = self:getChildByName("yilingqu_month");
+    self.yilingqu_month:setVisible(false);
+
+    EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
+
+    UmengHelper.onEvent("activity_vip_show");
+
+    self.yilingqu_month:setVisible(false);
+    self.btn_lingqu_month:setVisible(false);
+    self.btn_vip_lianxu:setVisible(false);
+
+
+    return self:update(true);
+end
+
+function ActivityVipView:onVipUpdate(eve)
+    self:update(false);
+    --    self:checkVipReward();
+end
+
+function ActivityVipView:checkVipReward()
+    local vipList = ShopInfo.getVipList();
+    local vipInfo = vipList[1];
+    local data = UserModel.getVipByID(vipInfo.id);
+    if data and data.val2 >= UserModel.time_second then
+        if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
+            -- 可领取
+            local reciever = require("app.views.view.ActivityVipDailyView"):show();
+
+            local scene = cc.Director:getInstance():getRunningScene();
+            scene.keypadManager:addKeypadReceiver(reciever);
+        else
+            -- 已领取
+        end
+    end
+end
+
+function ActivityVipView:update(_is_init)
+    local vipList = ShopInfo.getVipList();
+
+    local _nodes = { };
+
+    -- 续包月
+    local vipInfo1 = vipList[1];
+
+    local itemList1 = vipInfo1.itemList;
+    for i = 1, 2 do
+        local item = self:getChildByName("m_item_" .. i);
+        if i <= #itemList1 then
+            item:setVisible(true);
+            local icon_url = "res/icon/" .. itemList1[i].id .. ".png";
+            if cc.FileUtils:getInstance():isFileExist(icon_url) then
+                item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
+            end
+
+            local itemInfo = ItemInfo.getItemInfo(itemList1[i].id);
+            item:getChildByName("txt"):setString(itemInfo.name .. "x" .. StringUtil.getWanString(itemList1[i].num));
+        else
+            item:setVisible(false);
+        end
+    end
+
+    local has_vip_month = false;
+
+    if vipInfo1 then
+        local data3 = UserModel.getVipByID(vipInfo1.id);
+        if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
+            if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
+                -- 可领取
+                self.btn_lingqu_month:setVisible(true);
+                self.btn_lingqu_month.id = vipInfo1.id;
+                -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
+                _nodes[1] = { self.btn_lingqu_month };
+            else
+                -- 已领取
+                self.btn_lingqu_month:setVisible(false);
+                self.yilingqu_month:setVisible(true);
+            end
+        else 
+            self.btn_vip_lianxu:setVisible(true);
+            if #_nodes > 0 then
+                _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
+            else
+                _nodes[1] = {self.btn_vip_lianxu};
+            end
+        end
+    end
+
+    if not _is_init and self.update_nodes_func then
+        self.update_nodes_func(_nodes);
+    end
+    return _nodes;
+end
+
+function ActivityVipView:onGetClick(ref)
+    local vipList = ShopInfo.getVipList();
+    local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
+    ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
+end
+
+-- 包月(取消连续包月功能暂未实现，取消连续包月返回时应该调用update_msg接口通知后端服务器)
+function ActivityVipView:onGetContinueClick(ref)
+    local vipList = ShopInfo.getVipList();
+    local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
+    -- 包月卡的id，获取包月卡的item信息
+    -- 天津联通支付，支持连续包月
+    ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
+end
+
+function ActivityVipView:onLingquClick(ref)
+    NodeManager.setHighlight(ref, false);
+    local data = UserModel.getVipByID(ref.id);
+    if data and data.val2 >= UserModel.time_second then
+        if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
+            local function onDayRewardCallback(params)
+                cmsg.off("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
+                UserModel.setVipDayTime(data.key, UserModel.time_second);
+                self:update(false);
+            end
+            local function timeOutFun()
+                cmsg.off("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
+            end
+            cmsg.on("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
+            SocketClient:getInstance():send("gateway_msg.get_pay_day_reward_msg",
+            {
+                id = data.key
+            } , timeOutFun);
+        end
+    else
+        local shopInfo = ShopInfo.getPayInfo(ref.id);
+        ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
+    end
+end
+
+return ActivityVipView
\ No newline at end of file

@@ -185,8 +185,8 @@ function ActivityVipView:update(_is_init)
     end--]]
 
     -- 包年,没有包年
-    local vipInfo2 = vipList[2];
-    local itemList2 = vipInfo2.itemList;
+    --local vipInfo2 = vipList[2];
+    --local itemList2 = vipInfo2.itemList;
     --[[for i = 1, 3 do
         local item = self:getChildByName("y_item_" .. i);
         if i <= #itemList2 then

@@ -64,7 +64,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 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 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" then
+    if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" and CHANNEL~="scyd" then
         self.btn_wx.fn = function()
             self:onWxClick(self.btn_wx);
         end;

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

@@ -70,7 +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) 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) then    --隐藏金豆、钻石
             tab:setVisible(false);  
         else
             tab:setTag(i);
@@ -95,7 +96,7 @@ function ShopView:init()
 
     self.nodesCopy = TableUtil.copyTab(self.nodes);
 
-    if CHANNEL=="gzdt" or CHANNEL=="shdx" then
+    if CHANNEL=="gzdt" or CHANNEL=="shdx"  or CHANNEL=="scyd" then
         self.panel:getChildByName("img_diamond"):setVisible(false);      
     end
 
@@ -380,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" then
+                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
                     function okFun() end;
                     Alert.showTwo(strings.msg_1034,okFun);
                 else
@@ -407,7 +408,7 @@ function ShopView:onBuyCallBack(params)
         if shopItemInfo.costList[1].id == 100000 then
             Alert.showTwo(strings.msg_1032,okFun);
         else
-                if CHANNEL=="gzdt" then
+                if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" 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" then     --支付模式去除钻石任务
+    if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" 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);