Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2a2f97a2 2a2f97a23ea2be14b75cb6d893dc0631e534c7fe by jinwawa
Options

0821

1 parent 5fd3a262
Inline Side-by-side
Showing 39 changed files with 59 additions and 29 deletions
...@@ -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>1070100010142857</uid> 29 <uid>1060100010142873</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_sxyd\assets\res /E/I/Y
2 cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_sxyd\assets\src -e -k tpdrawgdanjue -b tpdrawgd
3
4 call xcopy %cd%\src D:\AndroidProject\XhxAndroid_sxyd\assets\src /E/I/Y
...\ No newline at end of file ...\ No newline at end of file
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
45 </platform> 45 </platform>
46 <!--上海电信--> 46 <!--上海电信-->
47 <platform id="106" channel="shdx"> 47 <platform id="106" channel="shdx">
48 <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"/> 48 <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"/>
49 <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"/> 49 <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"/>
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.00" 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.00" product="1000710713" productPuTao="qjqp999" notice="1"/>
52 </platform> 52 </platform>
53 <!--四川移动--> 53 <!--四川移动-->
54 <platform id="107" channel="scyd"> 54 <platform id="107" channel="scyd">
......

13.5 KB | W: | H:

14.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

14.1 KB | W: | H:

13.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

13.1 KB | W: | H:

14.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

13.5 KB | W: | H:

13.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -18,7 +18,12 @@ local function showPopItem() ...@@ -18,7 +18,12 @@ local function showPopItem()
18 local rect = PopItem:getBoundingBox(); 18 local rect = PopItem:getBoundingBox();
19 PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2)); 19 PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
20 local icon = PopItem:getChildByName("icon"); 20 local icon = PopItem:getChildByName("icon");
21 if CHANNEL=="shdx" and tonumber(obj.id)==100001 then
22 icon:loadTexture("res/icon/1000011.png");
23 else
21 icon:loadTexture("res/icon/"..obj.id..".png"); 24 icon:loadTexture("res/icon/"..obj.id..".png");
25 end
26
22 local item_amount = PopItem:getChildByName("item_amount"); 27 local item_amount = PopItem:getChildByName("item_amount");
23 local itemInfo = ItemInfo.getItemInfo(obj.id); 28 local itemInfo = ItemInfo.getItemInfo(obj.id);
24 item_amount:setString(itemInfo.name.."* "..obj.num); 29 item_amount:setString(itemInfo.name.."* "..obj.num);
......
...@@ -1061,7 +1061,7 @@ function UserModel.getLeftVipDay() ...@@ -1061,7 +1061,7 @@ function UserModel.getLeftVipDay()
1061 end 1061 end
1062 end 1062 end
1063 1063
1064 if CHANNEL == "gzdt" then 1064 if CHANNEL == "gzdt" or CHANNEL=="sxyd" then
1065 -- 大唐版本所有的用户都是VIP 1065 -- 大唐版本所有的用户都是VIP
1066 left_day_num = 100; 1066 left_day_num = 100;
1067 end 1067 end
......
...@@ -138,6 +138,7 @@ end ...@@ -138,6 +138,7 @@ end
138 138
139 function GameScene:startGame() 139 function GameScene:startGame()
140 self.is_starting = true; 140 self.is_starting = true;
141 ItemManager.lock_pop = true; --关掉弹窗
141 142
142 self.hero:init(); 143 self.hero:init();
143 self.hero:setPosition(self.hero.original_p); 144 self.hero:setPosition(self.hero.original_p);
......
...@@ -164,8 +164,8 @@ function GameStartView:onStart() ...@@ -164,8 +164,8 @@ function GameStartView:onStart()
164 if UserModel.getLeftVipDay() == 0 then 164 if UserModel.getLeftVipDay() == 0 then
165 print("小游戏购买界面"); 165 print("小游戏购买界面");
166 local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完 166 local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
167 logUI("每天免费玩一次： "..free_every_day_num.val1);
167 if free_every_day_num.val1==0 then 168 if free_every_day_num.val1==0 then
168 logUI("每天免费玩一次");
169 local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 }; 169 local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
171 paySuccessFun(); 171 paySuccessFun();
......
...@@ -234,6 +234,7 @@ end ...@@ -234,6 +234,7 @@ end
234 234
235 function CakeScene:startGame() 235 function CakeScene:startGame()
236 self.is_starting = true; 236 self.is_starting = true;
237 ItemManager.lock_pop = true; --关掉弹窗
237 end 238 end
238 239
239 function CakeScene:startMoveGou() 240 function CakeScene:startMoveGou()
......
...@@ -115,6 +115,7 @@ end ...@@ -115,6 +115,7 @@ end
115 115
116 function GameScene:startGame() 116 function GameScene:startGame()
117 self.is_starting = true; 117 self.is_starting = true;
118 ItemManager.lock_pop = true; --关掉弹窗
118 119
119 self.current_item_list = {}; 120 self.current_item_list = {};
120 121
......
...@@ -75,6 +75,7 @@ end ...@@ -75,6 +75,7 @@ end
75 75
76 function GameScene:startGame() 76 function GameScene:startGame()
77 self.is_starting = true; 77 self.is_starting = true;
78 ItemManager.lock_pop = true; --关掉弹窗
78 self.is_show_result = false; 79 self.is_show_result = false;
79 self.is_flopping = false; 80 self.is_flopping = false;
80 self.current_item = nil; 81 self.current_item = nil;
......
...@@ -182,6 +182,7 @@ end ...@@ -182,6 +182,7 @@ end
182 182
183 function GameScene:startGame() 183 function GameScene:startGame()
184 self.is_starting = true; 184 self.is_starting = true;
185 ItemManager.lock_pop = true; --关掉弹窗
185 186
186 self.hero:init(); 187 self.hero:init();
187 self.hero:setPosition(self.hero.original_p); 188 self.hero:setPosition(self.hero.original_p);
......
...@@ -84,6 +84,8 @@ end ...@@ -84,6 +84,8 @@ end
84 84
85 function GameScene:startGame() 85 function GameScene:startGame()
86 self.is_starting = true; 86 self.is_starting = true;
87 ItemManager.lock_pop = true; --关掉弹窗
88
87 self.is_show_result = false; 89 self.is_show_result = false;
88 SoundManager.playMusic("res/ui/guess/bg_music_game.mp3"); 90 SoundManager.playMusic("res/ui/guess/bg_music_game.mp3");
89 91
......
...@@ -85,6 +85,7 @@ end ...@@ -85,6 +85,7 @@ end
85 85
86 function GameScene:startGame() 86 function GameScene:startGame()
87 self.is_starting = true; 87 self.is_starting = true;
88 ItemManager.lock_pop = true; --关掉弹窗
88 self.is_show_result = false; 89 self.is_show_result = false;
89 90
90 self.fruit_bg:show(); 91 self.fruit_bg:show();
......
...@@ -158,6 +158,7 @@ end ...@@ -158,6 +158,7 @@ end
158 158
159 function GameScene:startGame() 159 function GameScene:startGame()
160 self.is_starting = true; 160 self.is_starting = true;
161 ItemManager.lock_pop = true; --关掉弹窗
161 162
162 self.mapContainer:setScale(HAIDAO_MAP_SCALE); 163 self.mapContainer:setScale(HAIDAO_MAP_SCALE);
163 164
......
...@@ -134,6 +134,7 @@ end ...@@ -134,6 +134,7 @@ end
134 134
135 function GameScene:startGame() 135 function GameScene:startGame()
136 self.is_starting = true; 136 self.is_starting = true;
137 ItemManager.lock_pop = true; --关掉弹窗
137 138
138 self.hero:init(); 139 self.hero:init();
139 self.hero:setPosition(self.hero.original_p); 140 self.hero:setPosition(self.hero.original_p);
......
...@@ -32,6 +32,10 @@ function LoadingScene:onCreate() ...@@ -32,6 +32,10 @@ function LoadingScene:onCreate()
32 self.ui = cc.CSLoader:createNode("ui/LoadingScene.csb"); 32 self.ui = cc.CSLoader:createNode("ui/LoadingScene.csb");
33 self:addChild(self.ui); 33 self:addChild(self.ui);
34 34
35 if CHANNEL=="shdx" then
36 self.ui:getChildByName("logo_game"):setSpriteFrame(cc.Sprite:create("res/common/logo_game_shdx.png"):getSpriteFrame());
37 end
38
35 self.ui:setContentSize(cc.size(display.width,display.height)); 39 self.ui:setContentSize(cc.size(display.width,display.height));
36 ccui.Helper:doLayout(self.ui); 40 ccui.Helper:doLayout(self.ui);
37 41
......
...@@ -74,6 +74,7 @@ end ...@@ -74,6 +74,7 @@ end
74 74
75 function GameScene:startGame() 75 function GameScene:startGame()
76 self.is_starting = true; 76 self.is_starting = true;
77 ItemManager.lock_pop = true; --关掉弹窗
77 78
78 self:showNextAnimal(); 79 self:showNextAnimal();
79 end 80 end
......
...@@ -113,7 +113,7 @@ function AchievementView:updateItems() ...@@ -113,7 +113,7 @@ function AchievementView:updateItems()
113 local list_nodes = { }; 113 local list_nodes = { };
114 local _list = AchievementInfo.getAchievementList(); 114 local _list = AchievementInfo.getAchievementList();
115 115
116 if CHANNEL=="gzdt" then --支付模式去掉钻石积累 116 if CHANNEL=="gzdt" or CHANNEL=="sxyd" then --支付模式去掉钻石积累
117 for i =1,#_list do 117 for i =1,#_list do
118 if _list[i] and _list[i].viewid==5 then 118 if _list[i] and _list[i].viewid==5 then
119 table.remove(_list,i); 119 table.remove(_list,i);
...@@ -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" or CHANNEL=="scyd" then --上海电信没有大富豪 130 if CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" 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);
...@@ -340,7 +340,7 @@ function AchievementView:setScrollPosition(node) ...@@ -340,7 +340,7 @@ function AchievementView:setScrollPosition(node)
340 340
341 local _list = AchievementInfo.getAchievementList(); 341 local _list = AchievementInfo.getAchievementList();
342 342
343 if CHANNEL=="gzdt" then --支付模式去掉钻石积累 343 if CHANNEL=="gzdt" or CHANNEL=="sxyd" then --支付模式去掉钻石积累
344 for i =1,#_list do 344 for i =1,#_list do
345 if _list[i] and _list[i].viewid==5 then 345 if _list[i] and _list[i].viewid==5 then
346 table.remove(_list,i); 346 table.remove(_list,i);
......
...@@ -120,7 +120,7 @@ function ActivityView:initActivity() ...@@ -120,7 +120,7 @@ function ActivityView:initActivity()
120 end 120 end
121 end 121 end
122 elseif v.act == "ActivityVipView" then 122 elseif v.act == "ActivityVipView" then
123 if CHANNEL=="gzdt" or #vipList<=0 then --0支付模式不能访问活动礼包 123 if CHANNEL=="gzdt" or CHANNEL=="sxyd" or #vipList<=0 then --0支付模式不能访问活动礼包
124 --活动礼包先判断有没有数据 124 --活动礼包先判断有没有数据
125 else 125 else
126 act_tab_list[#act_tab_list+1] = v; 126 act_tab_list[#act_tab_list+1] = v;
......
...@@ -38,6 +38,9 @@ function LoginView:init() ...@@ -38,6 +38,9 @@ function LoginView:init()
38 -- logUI("本地openid："..self.openid); 38 -- logUI("本地openid："..self.openid);
39 -- logUI("本地access_token："..self.access_token); 39 -- logUI("本地access_token："..self.access_token);
40 -- logUI("本地refresh_token："..self.refresh_token); 40 -- logUI("本地refresh_token："..self.refresh_token);
41 if CHANNEL=="shdx" then
42 self:getChildByName("panel"):getChildByName("logo_game"):setSpriteFrame(cc.Sprite:create("res/common/logo_game_shdx.png"):getSpriteFrame());
43 end
41 44
42 self.userID = cc.UserDefault:getInstance():getStringForKey("Account"); 45 self.userID = cc.UserDefault:getInstance():getStringForKey("Account");
43 46
...@@ -64,7 +67,7 @@ function LoginView:init() ...@@ -64,7 +67,7 @@ function LoginView:init()
64 local isUseWxLogin = true; 67 local isUseWxLogin = true;
65 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 68 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
66 --检测到cucc渠道、电脑平台时自动点击游客登录模式 69 --检测到cucc渠道、电脑平台时自动点击游客登录模式
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 70 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
68 self:doLogin(self.userID); 71 self:doLogin(self.userID);
69 else 72 else
70 if self.openid == "" or self.access_token == "" or self.refresh_token == "" then 73 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" and CHANNEL~="scyd" then 88 if GameConfig.is_open_wx_login and UserModel.login_type == 0 and CHANNEL~="gzdt" and CHANNEL~="shdx" and CHANNEL~="scyd" and CHANNEL~="sxyd" 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;
...@@ -213,7 +213,7 @@ function RoleBussinessView:update() ...@@ -213,7 +213,7 @@ function RoleBussinessView:update()
213 self.nodes = TableUtil.merge(self.nodes_copy, { _nodes }); 213 self.nodes = TableUtil.merge(self.nodes_copy, { _nodes });
214 end 214 end
215 215
216 if CHANNEL=="gzdt" then 216 if CHANNEL=="gzdt" or CHANNEL=="sxyd" then
217 self:getChildByName("txt_expire"):setVisible(false); 217 self:getChildByName("txt_expire"):setVisible(false);
218 end 218 end
219 219
......
...@@ -189,7 +189,7 @@ function RoleDressView:update() ...@@ -189,7 +189,7 @@ function RoleDressView:update()
189 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/icon/default.png"):getSpriteFrame()); 189 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/icon/default.png"):getSpriteFrame());
190 end 190 end
191 local itemInfo = ItemInfo.getItemInfo(item_id); 191 local itemInfo = ItemInfo.getItemInfo(item_id);
192 if itemInfo.vip == 1 and CHANNEL~="gzdt" then 192 if itemInfo.vip == 1 and CHANNEL~="gzdt" and CHANNEL~="sxyd" then
193 item:getChildByName("flag_vip"):setVisible(true); 193 item:getChildByName("flag_vip"):setVisible(true);
194 elseif itemInfo.vip == 1 and CHANNEL=="shdx" then 194 elseif itemInfo.vip == 1 and CHANNEL=="shdx" then
195 item:getChildByName("flag_vip"):setSpriteFrame(cc.Sprite:create("res/ui/shop/shop_textures_shdx.png"):getSpriteFrame()); 195 item:getChildByName("flag_vip"):setSpriteFrame(cc.Sprite:create("res/ui/shop/shop_textures_shdx.png"):getSpriteFrame());
......
...@@ -40,7 +40,7 @@ function RoleMainView:init() ...@@ -40,7 +40,7 @@ function RoleMainView:init()
40 self.nodes[2] = { }; 40 self.nodes[2] = { };
41 for i = 1, 5 do 41 for i = 1, 5 do
42 local tab = self:getChildByName("tab_" .. i); 42 local tab = self:getChildByName("tab_" .. i);
43 if CHANNEL == "gzdt" and i == 5 then 43 if CHANNEL == "gzdt" or CHANNEL=="sxyd" and i == 5 then
44 tab:setVisible(false); 44 tab:setVisible(false);
45 else 45 else
46 if CHANNEL=="shdx" and i==5 then 46 if CHANNEL=="shdx" and i==5 then
......
...@@ -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" or CHANNEL=="scyd" then 155 if CHANNEL=="gzdt" or CHANNEL=="scyd" or CHANNEL=="sxyd" 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,8 +70,8 @@ function ShopView:init() ...@@ -70,8 +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) 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 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 --隐藏金豆、钻石
75 tab:setVisible(false); 75 tab:setVisible(false);
76 else 76 else
77 tab:setTag(i); 77 tab:setTag(i);
...@@ -96,7 +96,7 @@ function ShopView:init() ...@@ -96,7 +96,7 @@ function ShopView:init()
96 96
97 self.nodesCopy = TableUtil.copyTab(self.nodes); 97 self.nodesCopy = TableUtil.copyTab(self.nodes);
98 98
99 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then 99 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
100 self.panel:getChildByName("img_diamond"):setVisible(false); 100 self.panel:getChildByName("img_diamond"):setVisible(false);
101 end 101 end
102 102
...@@ -294,7 +294,7 @@ function ShopView:update() ...@@ -294,7 +294,7 @@ function ShopView:update()
294 btn:show(); 294 btn:show();
295 _nodes[1][#_nodes[1]+1] = btn; 295 _nodes[1][#_nodes[1]+1] = btn;
296 end 296 end
297 if itemInfo.vip == 1 and CHANNEL~="gzdt" then 297 if itemInfo.vip == 1 and CHANNEL~="gzdt" and CHANNEL~="sxyd" then
298 shopItem:getChildByName("flag_vip"):setVisible(true); 298 shopItem:getChildByName("flag_vip"):setVisible(true);
299 if CHANNEL=="shdx" then 299 if CHANNEL=="shdx" then
300 shopItem:getChildByName("flag_vip"):setSpriteFrame(cc.Sprite:create("res/ui/shop/shop_textures_shdx.png"):getSpriteFrame()); 300 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) ...@@ -381,7 +381,7 @@ function ShopView:onBuyClick(ref,event)
381 if shopItemInfo.costList[1].id == 100000 then 381 if shopItemInfo.costList[1].id == 100000 then
382 Alert.showTwo(strings.msg_1032,okFun); 382 Alert.showTwo(strings.msg_1032,okFun);
383 else 383 else
384 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then 384 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
385 function okFun() end; 385 function okFun() end;
386 Alert.showTwo(strings.msg_1034,okFun); 386 Alert.showTwo(strings.msg_1034,okFun);
387 else 387 else
...@@ -408,7 +408,7 @@ function ShopView:onBuyCallBack(params) ...@@ -408,7 +408,7 @@ function ShopView:onBuyCallBack(params)
408 if shopItemInfo.costList[1].id == 100000 then 408 if shopItemInfo.costList[1].id == 100000 then
409 Alert.showTwo(strings.msg_1032,okFun); 409 Alert.showTwo(strings.msg_1032,okFun);
410 else 410 else
411 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" then 411 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" then
412 function okFun() end; 412 function okFun() end;
413 Alert.showTwo(strings.msg_1034,okFun); 413 Alert.showTwo(strings.msg_1034,okFun);
414 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" or CHANNEL=="scyd" then --支付模式去除钻石任务 52 if CHANNEL=="gzdt" or CHANNEL=="shdx" or CHANNEL=="scyd" or CHANNEL=="sxyd" 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);
...@@ -188,7 +188,7 @@ function TaskView:onGetClick(ref, event) ...@@ -188,7 +188,7 @@ function TaskView:onGetClick(ref, event)
188 UserModel.setTaskStep(currentTaskID, tonumber(currentStep.id)); 188 UserModel.setTaskStep(currentTaskID, tonumber(currentStep.id));
189 self:update(); 189 self:update();
190 end 190 end
191 print("领取任务奖励：" .. currentTaskID, currentStep.id) 191 print("领取任务奖励：" .. currentTaskID, currentStep.id);
192 cmsg.on("gateway_msg.get_task_daily_reward_msg_res", getTaskDailyRewardRes); 192 cmsg.on("gateway_msg.get_task_daily_reward_msg_res", getTaskDailyRewardRes);
193 SocketClient:getInstance():send("gateway_msg.get_task_daily_reward_msg", 193 SocketClient:getInstance():send("gateway_msg.get_task_daily_reward_msg",
194 { 194 {
......
...@@ -5,6 +5,7 @@ function XyxGameOver:ctor() ...@@ -5,6 +5,7 @@ function XyxGameOver:ctor()
5 end 5 end
6 6
7 function XyxGameOver:show(info,exitFun,againFun) 7 function XyxGameOver:show(info,exitFun,againFun)
8 ItemManager.lock_pop = false; --恢复弹窗
8 local scene = cc.Director:getInstance():getRunningScene() 9 local scene = cc.Director:getInstance():getRunningScene()
9 local inst = XyxGameOver:create(); 10 local inst = XyxGameOver:create();
10 scene:addChild(inst, dialog.ZORDER_POP); 11 scene:addChild(inst, dialog.ZORDER_POP);
......
...@@ -107,7 +107,7 @@ function XyxView:updateItems() ...@@ -107,7 +107,7 @@ function XyxView:updateItems()
107 item:getChildByName("panel"):getChildByName("flag"):setVisible(false); 107 item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
108 end 108 end
109 109
110 if CHANNEL=="gzdt" then 110 if CHANNEL=="gzdt" or CHANNEL=="sxyd" then
111 item:getChildByName("panel"):getChildByName("flag"):setVisible(false); 111 item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
112 end 112 end
113 113
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 <EndColor A="255" R="255" G="255" B="255" /> 133 <EndColor A="255" R="255" G="255" B="255" />
134 <ColorVector ScaleY="1.0000" /> 134 <ColorVector ScaleY="1.0000" />
135 </AbstractNodeData> 135 </AbstractNodeData>
136 <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"> 136 <AbstractNodeData Name="logo_game" ActionTag="492850395" Tag="982" IconVisible="False" LeftMargin="331.4974" RightMargin="326.5026" TopMargin="45.4631" BottomMargin="448.5369" ctype="SpriteObjectData">
137 <Size X="622.0000" Y="226.0000" /> 137 <Size X="622.0000" Y="226.0000" />
138 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 138 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
139 <Position X="642.4974" Y="561.5369" /> 139 <Position X="642.4974" Y="561.5369" />
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 <OutlineColor A="255" R="255" G="0" B="0" /> 116 <OutlineColor A="255" R="255" G="0" B="0" />
117 <ShadowColor A="255" R="110" G="110" B="110" /> 117 <ShadowColor A="255" R="110" G="110" B="110" />
118 </AbstractNodeData> 118 </AbstractNodeData>
119 <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"> 119 <AbstractNodeData Name="logo_game" ActionTag="1864072629" Tag="981" IconVisible="False" LeftMargin="327.6240" RightMargin="330.3760" TopMargin="56.7587" BottomMargin="437.2413" ctype="SpriteObjectData">
120 <Size X="622.0000" Y="226.0000" /> 120 <Size X="622.0000" Y="226.0000" />
121 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 121 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
122 <Position X="638.6240" Y="550.2413" /> 122 <Position X="638.6240" Y="550.2413" />
......
...@@ -33,8 +33,10 @@ ...@@ -33,8 +33,10 @@
33 <OpenedDocuments> 33 <OpenedDocuments>
34 <FilePathData Path="ui/dress/BusinessView.csd" /> 34 <FilePathData Path="ui/dress/BusinessView.csd" />
35 <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" /> 35 <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
36 <FilePathData Path="ui/LoginLayer.csd" />
37 <FilePathData Path="ui/LoadingScene.csd" />
36 </OpenedDocuments> 38 </OpenedDocuments>
37 <ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" /> 39 <ActiveDocument Path="ui/LoginLayer.csd" />
38 </Value> 40 </Value>
39 </Item> 41 </Item>
40 </Properties> 42 </Properties>
......