Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 5fd3a262 5fd3a262fa34de2166181a5940da6de8e764a7ba by jinwawa
Options

0812

1 parent 89a38380
Inline Side-by-side
Showing 17 changed files with 206 additions and 15 deletions
...@@ -101,7 +101,7 @@ function LoadingScene:loadNextSceneResource() ...@@ -101,7 +101,7 @@ function LoadingScene:loadNextSceneResource()
101 end 101 end
102 end 102 end
103 103
104 ccs.ArmatureDataManager:getInstance():addArmatureFileInfoAsync(string.format("res/ui/rubbish/%s/%s.ExportJson","color_candy","color_candy"), handler(self, self.loadFileCallback)); 104 --ccs.ArmatureDataManager:getInstance():addArmatureFileInfoAsync(string.format("res/ui/rubbish/%s/%s.ExportJson","color_candy","color_candy"), handler(self, self.loadFileCallback));
105 105
106 local percent = 0; 106 local percent = 0;
107 local function showProgressFun() 107 local function showProgressFun()
......
...@@ -28,5 +28,19 @@ ...@@ -28,5 +28,19 @@
28 <EnableHTML5Advanced Value="False" /> 28 <EnableHTML5Advanced Value="False" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/LoadingDataLayer.csd" />
35 <FilePathData Path="ui/rubbish/LoadingScene.csd" />
36 <FilePathData Path="ui/rubbish/GameStartLayer.csd" />
37 <FilePathData Path="ui/rubbish/GameScene.csd" />
38 <FilePathData Path="ui/rubbish/Rubbish.csd" />
39 <FilePathData Path="ui/rubbish/LevelPop.csd" />
40 <FilePathData Path="ui/AlertLayer.csd" />
41 </OpenedDocuments>
42 <ActiveDocument Path="ui/rubbish/LoadingScene.csd" />
43 </Value>
44 </Item>
31 </Properties> 45 </Properties>
32 </UserData> 46 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>603</feiyanzoubi_best> 28 <feiyanzoubi_best>603</feiyanzoubi_best>
29 <uid>1060100010142873</uid> 29 <uid>1070100010142857</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1107</bird_best> 31 <bird_best>1107</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
1 xcopy %cd%\res D:\AndroidProject\XhxAndroid_scyd\assets\res /E/I/Y
2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_scyd\assets\src -e -k tpdrawgdanjue -b tpdrawgd
3
4 call xcopy %cd%\src D:\AndroidProject\XhxAndroid_scyd\assets\src /E/I/Y
...\ No newline at end of file ...\ No newline at end of file
...@@ -50,7 +50,10 @@ ...@@ -50,7 +50,10 @@
50 <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"/> 50 <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"/>
51 <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"/> 51 <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"/>
52 </platform> 52 </platform>
53 53 <!--四川移动-->
54 <platform id="107" channel="scyd">
55 <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"/>
56 </platform>
54 </root> 57 </root>
55 58
56 59
......
...@@ -127,7 +127,7 @@ function AchievementView:updateItems() ...@@ -127,7 +127,7 @@ function AchievementView:updateItems()
127 end 127 end
128 end 128 end
129 129
130 if CHANNEL=="shdx" then --上海电信没有大富豪 130 if CHANNEL=="shdx" or CHANNEL=="scyd" then --上海电信没有大富豪
131 for i =1,#_list do 131 for i =1,#_list do
132 if _list[i] and _list[i].viewid==5 then 132 if _list[i] and _list[i].viewid==5 then
133 table.remove(_list,i); 133 table.remove(_list,i);
...@@ -354,7 +354,7 @@ function AchievementView:setScrollPosition(node) ...@@ -354,7 +354,7 @@ function AchievementView:setScrollPosition(node)
354 end 354 end
355 end 355 end
356 356
357 if CHANNEL=="shdx" then --上海电信没有大富豪 357 if CHANNEL=="shdx" or CHANNEL=="scyd" then --上海电信没有大富豪
358 for i =1,#_list do 358 for i =1,#_list do
359 if _list[i] and _list[i].viewid==5 then 359 if _list[i] and _list[i].viewid==5 then
360 table.remove(_list,i); 360 table.remove(_list,i);
......
...@@ -298,6 +298,8 @@ function ActivityView:updateTabState() ...@@ -298,6 +298,8 @@ function ActivityView:updateTabState()
298 self.activity_content.act_view = require("app.views.view.ActivityVipView_tianjin_cucc"):create(handler(self,self.update_nodes)); 298 self.activity_content.act_view = require("app.views.view.ActivityVipView_tianjin_cucc"):create(handler(self,self.update_nodes));
299 elseif CHANNEL=="shdx" then 299 elseif CHANNEL=="shdx" then
300 self.activity_content.act_view = require("app.views.view.ActivityVipView_shdx"):create(handler(self,self.update_nodes)); 300 self.activity_content.act_view = require("app.views.view.ActivityVipView_shdx"):create(handler(self,self.update_nodes));
301 elseif CHANNEL=="scyd" then
302 self.activity_content.act_view = require("app.views.view.ActivityVipView_scyd"):create(handler(self,self.update_nodes));
301 else 303 else
302 self.activity_content.act_view = require("app.views.view."..item.act):create(handler(self,self.update_nodes)); 304 self.activity_content.act_view = require("app.views.view."..item.act):create(handler(self,self.update_nodes));
303 end 305 end
......
1 local ActivityVipView = dialog.uinode("ui/Activity/tianjin_cucc/ActivityVip.csb", import(".BaseView"))
2
3 -- 四川移动，只有续包月功能
4 function ActivityVipView:ctor(_update_nodes_func)
5 ActivityVipView.super.ctor(self);
6
7 self.update_nodes_func = _update_nodes_func;
8 end
9
10 function ActivityVipView:init()
11 local _nodes = { };
12
13 local vipList = ShopInfo.getVipList();
14 -- （月卡，包年卡，包月卡）
15
16 self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
17 logD("vipList[3]--------------------->" .. #vipList);
18 if vipList[3] then
19 self.btn_vip_lianxu.id = vipList[3].id;
20 self.btn_vip_lianxu.fn = function()
21 self:onGetContinueClick(self.btn_vip_lianxu);
22 end
23 self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
24 end
25
26 self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
27 self.btn_lingqu_month.id = vipList[1].id;
28 self.btn_lingqu_month.fn = function()
29 self:onLingquClick(self.btn_lingqu_month);
30 end
31 self.btn_lingqu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
32
33 self.yilingqu_month = self:getChildByName("yilingqu_month");
34 self.yilingqu_month:setVisible(false);
35
36 EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
37
38 UmengHelper.onEvent("activity_vip_show");
39
40 self.yilingqu_month:setVisible(false);
41 self.btn_lingqu_month:setVisible(false);
42 self.btn_vip_lianxu:setVisible(false);
43
44
45 return self:update(true);
46 end
47
48 function ActivityVipView:onVipUpdate(eve)
49 self:update(false);
50 -- self:checkVipReward();
51 end
52
53 function ActivityVipView:checkVipReward()
54 local vipList = ShopInfo.getVipList();
55 local vipInfo = vipList[1];
56 local data = UserModel.getVipByID(vipInfo.id);
57 if data and data.val2 >= UserModel.time_second then
58 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
59 -- 可领取
60 local reciever = require("app.views.view.ActivityVipDailyView"):show();
61
62 local scene = cc.Director:getInstance():getRunningScene();
63 scene.keypadManager:addKeypadReceiver(reciever);
64 else
65 -- 已领取
66 end
67 end
68 end
69
70 function ActivityVipView:update(_is_init)
71 local vipList = ShopInfo.getVipList();
72
73 local _nodes = { };
74
75 -- 续包月
76 local vipInfo1 = vipList[1];
77
78 local itemList1 = vipInfo1.itemList;
79 for i = 1, 2 do
80 local item = self:getChildByName("m_item_" .. i);
81 if i <= #itemList1 then
82 item:setVisible(true);
83 local icon_url = "res/icon/" .. itemList1[i].id .. ".png";
84 if cc.FileUtils:getInstance():isFileExist(icon_url) then
85 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
86 end
87
88 local itemInfo = ItemInfo.getItemInfo(itemList1[i].id);
89 item:getChildByName("txt"):setString(itemInfo.name .. "x" .. StringUtil.getWanString(itemList1[i].num));
90 else
91 item:setVisible(false);
92 end
93 end
94
95 local has_vip_month = false;
96
97 if vipInfo1 then
98 local data3 = UserModel.getVipByID(vipInfo1.id);
99 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
100 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
101 -- 可领取
102 self.btn_lingqu_month:setVisible(true);
103 self.btn_lingqu_month.id = vipInfo1.id;
104 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
105 _nodes[1] = { self.btn_lingqu_month };
106 else
107 -- 已领取
108 self.btn_lingqu_month:setVisible(false);
109 self.yilingqu_month:setVisible(true);
110 end
111 else
112 self.btn_vip_lianxu:setVisible(true);
113 if #_nodes > 0 then
114 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
115 else
116 _nodes[1] = {self.btn_vip_lianxu};
117 end
118 end
119 end
120
121 if not _is_init and self.update_nodes_func then
122 self.update_nodes_func(_nodes);
123 end
124 return _nodes;
125 end
126
127 function ActivityVipView:onGetClick(ref)
128 local vipList = ShopInfo.getVipList();
129 local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
130 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
131 end
132
133 -- 包月(取消连续包月功能暂未实现，取消连续包月返回时应该调用update_msg接口通知后端服务器)
134 function ActivityVipView:onGetContinueClick(ref)
135 local vipList = ShopInfo.getVipList();
136 local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
137 -- 包月卡的id，获取包月卡的item信息
138 -- 天津联通支付，支持连续包月
139 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
140 end
141
142 function ActivityVipView:onLingquClick(ref)
143 NodeManager.setHighlight(ref, false);
144 local data = UserModel.getVipByID(ref.id);
145 if data and data.val2 >= UserModel.time_second then
146 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
147 local function onDayRewardCallback(params)
148 cmsg.off("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
149 UserModel.setVipDayTime(data.key, UserModel.time_second);
150 self:update(false);
151 end
152 local function timeOutFun()
153 cmsg.off("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
154 end
155 cmsg.on("gateway_msg.get_pay_day_reward_msg_res", onDayRewardCallback);
156 SocketClient:getInstance():send("gateway_msg.get_pay_day_reward_msg",
157 {
158 id = data.key
159 } , timeOutFun);
160 end
161 else
162 local shopInfo = ShopInfo.getPayInfo(ref.id);
163 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
164 end
165 end
166
167 return ActivityVipView
...\ No newline at end of file ...\ No newline at end of file
...@@ -185,8 +185,8 @@ function ActivityVipView:update(_is_init) ...@@ -185,8 +185,8 @@ function ActivityVipView:update(_is_init)
185 end--]] 185 end--]]
186 186
187 -- 包年,没有包年 187 -- 包年,没有包年
188 local vipInfo2 = vipList[2]; 188 --local vipInfo2 = vipList[2];
189 local itemList2 = vipInfo2.itemList; 189 --local itemList2 = vipInfo2.itemList;
190 --[[for i = 1, 3 do 190 --[[for i = 1, 3 do
191 local item = self:getChildByName("y_item_" .. i); 191 local item = self:getChildByName("y_item_" .. i);
192 if i <= #itemList2 then 192 if i <= #itemList2 then
......
...@@ -64,7 +64,7 @@ function LoginView:init() ...@@ -64,7 +64,7 @@ function LoginView:init()
64 local isUseWxLogin = true; 64 local isUseWxLogin = true;
65 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 65 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
66 --检测到cucc渠道、电脑平台时自动点击游客登录模式 66 --检测到cucc渠道、电脑平台时自动点击游客登录模式
67 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 67 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
68 self:doLogin(self.userID); 68 self:doLogin(self.userID);
69 else 69 else
70 if self.openid == "" or self.access_token == "" or self.refresh_token == "" then 70 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_ ...@@ -85,7 +85,7 @@ function RoleBussinessView:init(_nodes, _update_nodes_func, _update_nodes_state_
85 end 85 end
86 -- logUI(shanchang_game.."---<RoleBussinessView --shanchanggame--------->"..ruoxiang_game); 86 -- logUI(shanchang_game.."---<RoleBussinessView --shanchanggame--------->"..ruoxiang_game);
87 self.btn_wx = self:getChildByName("btn_wx"); 87 self.btn_wx = self:getChildByName("btn_wx");
88 if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" then 88 if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" and CHANNEL~="scyd" then
89 self.btn_wx.fn = function() 89 self.btn_wx.fn = function()
90 self:onWxClick(self.btn_wx); 90 self:onWxClick(self.btn_wx);
91 end; 91 end;
......
...@@ -152,7 +152,7 @@ function ShopExchangeView:onOkFn(ref) ...@@ -152,7 +152,7 @@ function ShopExchangeView:onOkFn(ref)
152 else 152 else
153 --Alert.showTwo(strings.msg_1003,okFun); 153 --Alert.showTwo(strings.msg_1003,okFun);
154 154
155 if CHANNEL=="gzdt" then 155 if CHANNEL=="gzdt" or CHANNEL=="scyd" then
156 function okFun() end; 156 function okFun() end;
157 Alert.showTwo(strings.msg_1034,okFun); 157 Alert.showTwo(strings.msg_1034,okFun);
158 else 158 else
......
...@@ -70,7 +70,8 @@ function ShopView:init() ...@@ -70,7 +70,8 @@ function ShopView:init()
70 local tab = self.panel:getChildByName("tab_"..i); 70 local tab = self.panel:getChildByName("tab_"..i);
71 71
72 --判断是否支持支付模式 72 --判断是否支持支付模式
73 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 --隐藏金豆、钻石 73 if (CHANNEL=="gzdt" and i==5) or (CHANNEL=="gzdt" and i==6)or (CHANNEL=="shdx" and i==5) or (CHANNEL=="shdx" and i==6)
74 or (CHANNEL=="scyd" and i==5) or (CHANNEL=="scyd" and i==6) then --隐藏金豆、钻石
74 tab:setVisible(false); 75 tab:setVisible(false);
75 else 76 else
76 tab:setTag(i); 77 tab:setTag(i);
...@@ -95,7 +96,7 @@ function ShopView:init() ...@@ -95,7 +96,7 @@ function ShopView:init()
95 96
96 self.nodesCopy = TableUtil.copyTab(self.nodes); 97 self.nodesCopy = TableUtil.copyTab(self.nodes);
97 98
98 if CHANNEL=="gzdt" or CHANNEL=="shdx" then 99 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
99 self.panel:getChildByName("img_diamond"):setVisible(false); 100 self.panel:getChildByName("img_diamond"):setVisible(false);
100 end 101 end
101 102
...@@ -380,7 +381,7 @@ function ShopView:onBuyClick(ref,event) ...@@ -380,7 +381,7 @@ function ShopView:onBuyClick(ref,event)
380 if shopItemInfo.costList[1].id == 100000 then 381 if shopItemInfo.costList[1].id == 100000 then
381 Alert.showTwo(strings.msg_1032,okFun); 382 Alert.showTwo(strings.msg_1032,okFun);
382 else 383 else
383 if CHANNEL=="gzdt" or CHANNEL=="shdx" then 384 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
384 function okFun() end; 385 function okFun() end;
385 Alert.showTwo(strings.msg_1034,okFun); 386 Alert.showTwo(strings.msg_1034,okFun);
386 else 387 else
...@@ -407,7 +408,7 @@ function ShopView:onBuyCallBack(params) ...@@ -407,7 +408,7 @@ function ShopView:onBuyCallBack(params)
407 if shopItemInfo.costList[1].id == 100000 then 408 if shopItemInfo.costList[1].id == 100000 then
408 Alert.showTwo(strings.msg_1032,okFun); 409 Alert.showTwo(strings.msg_1032,okFun);
409 else 410 else
410 if CHANNEL=="gzdt" then 411 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then
411 function okFun() end; 412 function okFun() end;
412 Alert.showTwo(strings.msg_1034,okFun); 413 Alert.showTwo(strings.msg_1034,okFun);
413 else 414 else
......
...@@ -49,7 +49,7 @@ function TaskView:update() ...@@ -49,7 +49,7 @@ function TaskView:update()
49 49
50 self.list = UserModel.getTaskList(); 50 self.list = UserModel.getTaskList();
51 51
52 if CHANNEL=="gzdt" or CHANNEL=="shdx" then --支付模式去除钻石任务 52 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then --支付模式去除钻石任务
53 for i=0,#self.list-1 do 53 for i=0,#self.list-1 do
54 if self.list[i + 1] and self.list[i + 1].id==10 then 54 if self.list[i + 1] and self.list[i + 1].id==10 then
55 table.remove(self.list,i+1); 55 table.remove(self.list,i+1);
......