Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit fe27a2a7 fe27a2a71ae5ae6bac21ef6fadee962cc9a741fc by jinwawa
Options

0723

1 parent 21b032a8
Expand all
Inline Side-by-side
Showing 25 changed files with 122 additions and 113 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800278b87c21</Account> 6 <Account>m0800278b87c87</Account>
7 <exp>0</exp> 7 <exp>0</exp>
8 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
9 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -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>1030100010142926</uid> 29 <uid>1010100010254572</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>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="10"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="15"/> 48 <common id="24" val="9999999"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="1"/> 51 <common id="10000" val="1"/>
......
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
36 <step id="1" reward="100001,100"/> 36 <step id="1" reward="100001,100"/>
37 </task> 37 </task>
38 <task id="10" name="购买钻石" pic="icon_diamond.png" desc="购买钻石1次"> 38 <task id="10" name="购买钻石" pic="icon_diamond.png" desc="购买钻石1次">
39 <step id="1" reward="100001,100"/> 39 <step id="1" reward="100001,1000"/>
40 </task> 40 </task>
41 </root> 41 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -39,6 +39,9 @@ function SingleGameInfo.get_game_info(id) ...@@ -39,6 +39,9 @@ function SingleGameInfo.get_game_info(id)
39 for i,v in ipairs(_list) do 39 for i,v in ipairs(_list) do
40 if v.id == id then 40 if v.id == id then
41 info = v; 41 info = v;
42 if v.id==10 and CHANNEL=="ws" then
43 info.name="火箭小象";
44 end
42 end 45 end
43 end 46 end
44 return info; 47 return info;
......
...@@ -8,19 +8,15 @@ local runningScene = nil; ...@@ -8,19 +8,15 @@ local runningScene = nil;
8 local lastPopTime = 0; 8 local lastPopTime = 0;
9 9
10 local function showPopItem() 10 local function showPopItem()
11 logUI("6666");
12 if not isPopping then 11 if not isPopping then
13 logUI("7777= "..#queuePopList);
14 if #queuePopList > 0 then 12 if #queuePopList > 0 then
15 isPopping = true; 13 isPopping = true;
16 logUI("11111");
17 local obj = queuePopList[1]; 14 local obj = queuePopList[1];
18 table.remove(queuePopList,1); 15 table.remove(queuePopList,1);
19 16
20 local PopItem = cc.CSLoader:createNode("ui/PopItem.csb"); 17 local PopItem = cc.CSLoader:createNode("ui/PopItem.csb");
21 local rect = PopItem:getBoundingBox(); 18 local rect = PopItem:getBoundingBox();
22 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));
23 logUI("2222");
24 local icon = PopItem:getChildByName("icon"); 20 local icon = PopItem:getChildByName("icon");
25 icon:loadTexture("res/icon/"..obj.id..".png"); 21 icon:loadTexture("res/icon/"..obj.id..".png");
26 local item_amount = PopItem:getChildByName("item_amount"); 22 local item_amount = PopItem:getChildByName("item_amount");
...@@ -28,7 +24,6 @@ logUI("6666"); ...@@ -28,7 +24,6 @@ logUI("6666");
28 item_amount:setString(itemInfo.name.."* "..obj.num); 24 item_amount:setString(itemInfo.name.."* "..obj.num);
29 25
30 runningScene:addChild(PopItem,dialog.ZORDER_POP+1); 26 runningScene:addChild(PopItem,dialog.ZORDER_POP+1);
31 logUI("33333");
32 local function fadeOutBack() 27 local function fadeOutBack()
33 PopItem:removeSelf(); 28 PopItem:removeSelf();
34 29
...@@ -41,14 +36,10 @@ logUI("6666"); ...@@ -41,14 +36,10 @@ logUI("6666");
41 local moveBy = cc.MoveBy:create(1, cc.p(0, 200)); 36 local moveBy = cc.MoveBy:create(1, cc.p(0, 200));
42 PopItem:runAction(moveBy); 37 PopItem:runAction(moveBy);
43 PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack))); 38 PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack)));
44 logUI("4444");
45 local function nextPopFun() 39 local function nextPopFun()
46 isPopping = false; 40 isPopping = false;
47 logUI("0000");
48 showPopItem(); 41 showPopItem();
49 end 42 end
50 logUI("5555");
51 print("ItemManater showPopItem==================",runningScene);
52 runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun))); 43 runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun)));
53 end 44 end
54 end 45 end
...@@ -65,7 +56,6 @@ function ItemManager.addPopItem(ID,num) ...@@ -65,7 +56,6 @@ function ItemManager.addPopItem(ID,num)
65 runningScene = cc.Director:getInstance():getRunningScene(); 56 runningScene = cc.Director:getInstance():getRunningScene();
66 end 57 end
67 queuePopList[#queuePopList+1] = obj; 58 queuePopList[#queuePopList+1] = obj;
68 print("ItemManager runningScene================ ",runningScene);
69 59
70 -- if ID == 100001 then 60 -- if ID == 100001 then
71 -- ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold")) 61 -- ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold"))
......
...@@ -170,17 +170,20 @@ function GameStartView:onStart() ...@@ -170,17 +170,20 @@ function GameStartView:onStart()
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();
172 else 172 else
173 if CHANNEL=="shdx" then 173 local function okFun()
174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 174 if CHANNEL == "shdx" then
175 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 176 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
176 elseif CHANNEL=="cucc" then 177 elseif CHANNEL == "cucc" then
177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 178 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 179 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
179 else 180 else
180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 181 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 182 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
182 end 183 end
183 end 184 end
185 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
186 end
184 return; 187 return;
185 else 188 else
186 paySuccessFun(); 189 paySuccessFun();
......
...@@ -123,17 +123,20 @@ function GameStartView:onStart() ...@@ -123,17 +123,20 @@ function GameStartView:onStart()
123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
124 paySuccessFun(); 124 paySuccessFun();
125 else 125 else
126 if CHANNEL=="shdx" then 126 local function okFun()
127 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 127 if CHANNEL == "shdx" then
128 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
129 elseif CHANNEL=="cucc" then 130 elseif CHANNEL == "cucc" then
130 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 131 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 132 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
132 else 133 else
133 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 134 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
135 end 136 end
136 end 137 end
138 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
139 end
137 return; 140 return;
138 else 141 else
139 paySuccessFun(); 142 paySuccessFun();
......
...@@ -123,17 +123,20 @@ function GameStartView:onStart() ...@@ -123,17 +123,20 @@ function GameStartView:onStart()
123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
124 paySuccessFun(); 124 paySuccessFun();
125 else 125 else
126 if CHANNEL=="shdx" then 126 local function okFun()
127 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 127 if CHANNEL == "shdx" then
128 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
129 elseif CHANNEL=="cucc" then 130 elseif CHANNEL == "cucc" then
130 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 131 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 132 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
132 else 133 else
133 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 134 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
135 end 136 end
136 end 137 end
138 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
139 end
137 return; 140 return;
138 else 141 else
139 paySuccessFun(); 142 paySuccessFun();
......
...@@ -159,17 +159,20 @@ function GameStartView:onStart() ...@@ -159,17 +159,20 @@ function GameStartView:onStart()
159 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 159 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
160 paySuccessFun(); 160 paySuccessFun();
161 else 161 else
162 if CHANNEL=="shdx" then 162 local function okFun()
163 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 163 if CHANNEL == "shdx" then
164 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
164 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 165 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
165 elseif CHANNEL=="cucc" then 166 elseif CHANNEL == "cucc" then
166 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 167 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
167 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 168 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
168 else 169 else
169 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 170 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
170 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
171 end 172 end
172 end 173 end
174 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
175 end
173 return; 176 return;
174 else 177 else
175 paySuccessFun(); 178 paySuccessFun();
......
...@@ -129,17 +129,20 @@ function GameStartView:onStart() ...@@ -129,17 +129,20 @@ function GameStartView:onStart()
129 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 129 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
130 paySuccessFun(); 130 paySuccessFun();
131 else 131 else
132 if CHANNEL=="shdx" then 132 local function okFun()
133 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 133 if CHANNEL == "shdx" then
134 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
135 elseif CHANNEL=="cucc" then 136 elseif CHANNEL == "cucc" then
136 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 137 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
137 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 138 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
138 else 139 else
139 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 140 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
140 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 141 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
141 end 142 end
142 end 143 end
144 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
145 end
143 return; 146 return;
144 else 147 else
145 paySuccessFun(); 148 paySuccessFun();
......
...@@ -117,17 +117,20 @@ function GameStartView:onStart() ...@@ -117,17 +117,20 @@ function GameStartView:onStart()
117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
118 paySuccessFun(); 118 paySuccessFun();
119 else 119 else
120 if CHANNEL=="shdx" then 120 local function okFun()
121 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 121 if CHANNEL == "shdx" then
122 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 123 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
123 elseif CHANNEL=="cucc" then 124 elseif CHANNEL == "cucc" then
124 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 125 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 126 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 else 127 else
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 128 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
129 end 130 end
130 end 131 end
132 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
133 end
131 return; 134 return;
132 else 135 else
133 paySuccessFun(); 136 paySuccessFun();
......
...@@ -117,17 +117,20 @@ function GameStartView:onStart() ...@@ -117,17 +117,20 @@ function GameStartView:onStart()
117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
118 paySuccessFun(); 118 paySuccessFun();
119 else 119 else
120 if CHANNEL=="shdx" then 120 local function okFun()
121 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 121 if CHANNEL == "shdx" then
122 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 123 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
123 elseif CHANNEL=="cucc" then 124 elseif CHANNEL == "cucc" then
124 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 125 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 126 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 else 127 else
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 128 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
129 end 130 end
130 end 131 end
132 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
133 end
131 return; 134 return;
132 else 135 else
133 paySuccessFun(); 136 paySuccessFun();
......
...@@ -169,17 +169,20 @@ function GameStartView:onStart() ...@@ -169,17 +169,20 @@ function GameStartView:onStart()
169 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 169 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
170 paySuccessFun(); 170 paySuccessFun();
171 else 171 else
172 if CHANNEL=="shdx" then 172 local function okFun()
173 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 173 if CHANNEL == "shdx" then
174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
175 elseif CHANNEL=="cucc" then 176 elseif CHANNEL == "cucc" then
176 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
177 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
178 else 179 else
179 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
180 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
181 end 182 end
182 end 183 end
184 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
185 end
183 return; 186 return;
184 else 187 else
185 paySuccessFun(); 188 paySuccessFun();
......
...@@ -170,17 +170,20 @@ function GameStartView:onStart() ...@@ -170,17 +170,20 @@ function GameStartView:onStart()
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();
172 else 172 else
173 if CHANNEL=="shdx" then 173 local function okFun()
174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 174 if CHANNEL == "shdx" then
175 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 176 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
176 elseif CHANNEL=="cucc" then 177 elseif CHANNEL == "cucc" then
177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 178 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 179 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
179 else 180 else
180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 181 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 182 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
182 end 183 end
183 end 184 end
185 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
186 end
184 return; 187 return;
185 else 188 else
186 paySuccessFun(); 189 paySuccessFun();
......
...@@ -6,12 +6,14 @@ function PetPkScene:ctor(params) ...@@ -6,12 +6,14 @@ function PetPkScene:ctor(params)
6 end 6 end
7 7
8 function PetPkScene:onCreate(params) 8 function PetPkScene:onCreate(params)
9 ItemManager.lock_pop = false; --恢复弹窗
9 --GameConfig.pk_num; --每日PK次数上限 10 --GameConfig.pk_num; --每日PK次数上限
10 --GameConfig.pk_num_vip; --每日VIP，pk次数上限 11 --GameConfig.pk_num_vip; --每日VIP，pk次数上限
11 --UserModel.user_info.pk_daily_cnt; --今日已pk次数 12 --UserModel.user_info.pk_daily_cnt; --今日已pk次数
12 local left_vip_day = UserModel.getLeftVipDay(); 13 local left_vip_day = UserModel.getLeftVipDay();
13 if left_vip_day > 0 then 14 if left_vip_day > 0 or MEMBER_TYPE~=0 then
14 GameConfig.pk_num_vip=GameConfig.pk_num_vip-1; 15 --GameConfig.pk_num_vip=GameConfig.pk_num_vip-1; --会员无限次
16 GameConfig.pk_num_vip=9000000;
15 else 17 else
16 GameConfig.pk_num=GameConfig.pk_num-1; 18 GameConfig.pk_num=GameConfig.pk_num-1;
17 end 19 end
......
...@@ -127,6 +127,9 @@ function AchievementView:updateItems() ...@@ -127,6 +127,9 @@ function AchievementView:updateItems()
127 if _list[i] and _list[i].viewid==5 then 127 if _list[i] and _list[i].viewid==5 then
128 table.remove(_list,i); 128 table.remove(_list,i);
129 end 129 end
130 if _list[i] and _list[i].viewid==11 then
131 table.remove(_list,i);
132 end
130 end 133 end
131 end 134 end
132 135
...@@ -351,6 +354,9 @@ function AchievementView:setScrollPosition(node) ...@@ -351,6 +354,9 @@ function AchievementView:setScrollPosition(node)
351 if _list[i] and _list[i].viewid==5 then 354 if _list[i] and _list[i].viewid==5 then
352 table.remove(_list,i); 355 table.remove(_list,i);
353 end 356 end
357 if _list[i] and _list[i].viewid==11 then
358 table.remove(_list,i);
359 end
354 end 360 end
355 end 361 end
356 362
......
...@@ -52,12 +52,6 @@ function ActivityVipView:init() ...@@ -52,12 +52,6 @@ function ActivityVipView:init()
52 52
53 UmengHelper.onEvent("activity_vip_show"); 53 UmengHelper.onEvent("activity_vip_show");
54 54
55 self.yilingqu_month:setVisible(false);
56 self.yilingqu_year:setVisible(false);
57 self.btn_lingqu_month:setVisible(false);
58 self.btn_vip_year:setVisible(false);
59 self.btn_lingqu_year:setVisible(false);
60
61 return self:update(true); 55 return self:update(true);
62 end 56 end
63 57
...@@ -84,14 +78,18 @@ function ActivityVipView:checkVipReward() ...@@ -84,14 +78,18 @@ function ActivityVipView:checkVipReward()
84 end 78 end
85 79
86 function ActivityVipView:update(_is_init) 80 function ActivityVipView:update(_is_init)
81 self.btn_vip_year:setVisible(false);
82 self.btn_vip_lianxu:setVisible(false);
83 self.yilingqu_month:setVisible(false);
84 self.yilingqu_year:setVisible(false);
85 self.btn_lingqu_month:setVisible(false);
86 self.btn_lingqu_year:setVisible(false);
87 local vipList = ShopInfo.getVipList(); 87 local vipList = ShopInfo.getVipList();
88 88
89 local _nodes = { }; 89 local _nodes = { };
90 90
91 -- 包月 91 -- 包月
92 local vipInfo1 = vipList[1]; 92 local vipInfo1 = vipList[1];
93 -- 连续包月
94 local vipInfo3 = vipList[3];
95 93
96 local itemList1 = vipInfo1.itemList; 94 local itemList1 = vipInfo1.itemList;
97 for i = 1, 2 do 95 for i = 1, 2 do
...@@ -114,11 +112,6 @@ function ActivityVipView:update(_is_init) ...@@ -114,11 +112,6 @@ function ActivityVipView:update(_is_init)
114 local data1 = UserModel.getVipByID(vipInfo1.id); 112 local data1 = UserModel.getVipByID(vipInfo1.id);
115 if data1 and data1.val2 >= UserModel.time_second then 113 if data1 and data1.val2 >= UserModel.time_second then
116 has_vip_month = true; 114 has_vip_month = true;
117 elseif vipInfo3 then
118 local data3 = UserModel.getVipByID(vipInfo3.id);
119 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
120 has_vip_month = true;
121 end
122 end 115 end
123 116
124 local data1 = UserModel.getVipByID(vipInfo1.id); 117 local data1 = UserModel.getVipByID(vipInfo1.id);
...@@ -143,44 +136,13 @@ function ActivityVipView:update(_is_init) ...@@ -143,44 +136,13 @@ function ActivityVipView:update(_is_init)
143 self.yilingqu_month:setVisible(true); 136 self.yilingqu_month:setVisible(true);
144 end 137 end
145 elseif not has_vip_month then 138 elseif not has_vip_month then
146 if vipInfo3 then 139 self.btn_vip_lianxu:setVisible(true);
147 -- self.btn_vip_month:setVisible(true);
148 -- _nodes[1] = { self.btn_vip_month };
149 else
150 -- self.btn_vip_month_single:setVisible(true);
151 -- _nodes[1] = { self.btn_vip_month_single };
152 end
153 end
154
155 if vipInfo3 then
156 local data3 = UserModel.getVipByID(vipInfo3.id);
157 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
158 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
159 -- 可领取
160 self.btn_lingqu_month:setVisible(true);
161 self.btn_lingqu_month.id = vipInfo3.id;
162 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
163 _nodes[1] = { self.btn_lingqu_month };
164 else
165 -- 已领取
166 self.btn_lingqu_month:setVisible(false);
167 self.yilingqu_month:setVisible(true);
168 end
169 elseif not has_vip_month then
170 --[[self.btn_vip_lianxu:setVisible(true);
171 if #_nodes > 0 then
172 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
173 else
174 _nodes[1] = {self.btn_vip_lianxu};
175 end--]]
176 end
177 end
178
179 if #_nodes > 0 then 140 if #_nodes > 0 then
180 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu; 141 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
181 else 142 else
182 _nodes[1] = { self.btn_vip_lianxu }; 143 _nodes[1] = { self.btn_vip_lianxu };
183 end 144 end
145 end
184 146
185 -- 包年 147 -- 包年
186 local vipInfo2 = vipList[2]; 148 local vipInfo2 = vipList[2];
......
...@@ -526,9 +526,13 @@ function FriendView:onPkClick(ref) ...@@ -526,9 +526,13 @@ function FriendView:onPkClick(ref)
526 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 526 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
527 paySuccessFun(); 527 paySuccessFun();
528 else 528 else
529 logUI("shdx------------------>");
529 local reciever = nil; 530 local reciever = nil;
530 if CHANNEL=="cucc" then 531 if CHANNEL=="cucc" then
531 reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 532 reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
533 elseif CHANNEL=="shdx" then
534 logUI("shdx2222------------------>");
535 reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
532 else 536 else
533 reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 537 reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
534 end 538 end
......
...@@ -15,9 +15,11 @@ function PetFightView:init(_nodes,_update_nodes_func) ...@@ -15,9 +15,11 @@ function PetFightView:init(_nodes,_update_nodes_func)
15 --UserModel.user_info.pk_daily_cnt; --今日已pk次数 15 --UserModel.user_info.pk_daily_cnt; --今日已pk次数
16 local left_vip_day = UserModel.getLeftVipDay(); 16 local left_vip_day = UserModel.getLeftVipDay();
17 self.remain_value=0; 17 self.remain_value=0;
18 if left_vip_day > 0 then 18 if left_vip_day > 0 or MEMBER_TYPE~=0 then
19 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt; 19 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
20 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt)); 20 --self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt));
21 self:getChildByName("pk_num"):setString("今日剩余次数：无限");
22 self.remain_value=9000000;
21 else 23 else
22 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt; 24 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
23 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt)); 25 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt));
...@@ -162,13 +164,14 @@ function PetFightView:onScoreFightClick() ...@@ -162,13 +164,14 @@ function PetFightView:onScoreFightClick()
162 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id); 164 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id);
163 165
164 if self.remain_value<=0 then 166 if self.remain_value<=0 then
165 Alert.showOne("今日挑战次数已用完\n明天再来哦"); 167 Alert.showOne("成为会员每日无限制pk次数限制");
166 return; 168 return;
167 elseif #team_v.pet_id == 4 then 169 elseif #team_v.pet_id == 4 then
168 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun); 170 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun);
169 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun); 171 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun);
170 172
171 self.notifyGameEndCallbackFun = handler(self,self.onNotifyGameEndCallBackFun); 173 self.notifyGameEndCallbackFun = handler(self,self.onNotifyGameEndCallBackFun);
174 ItemManager.lock_pop = true; --关掉弹窗
172 cmsg.on("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun); 175 cmsg.on("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
173 176
174 SocketClient:getInstance():send("gateway_msg.lobby_enter_msg",{pet_id = team_v.pet_id}); 177 SocketClient:getInstance():send("gateway_msg.lobby_enter_msg",{pet_id = team_v.pet_id});
......
...@@ -162,8 +162,9 @@ end ...@@ -162,8 +162,9 @@ end
162 function PetPkResultView:onAgain() 162 function PetPkResultView:onAgain()
163 local left_vip_day = UserModel.getLeftVipDay(); 163 local left_vip_day = UserModel.getLeftVipDay();
164 self.remain_value=0; 164 self.remain_value=0;
165 if left_vip_day > 0 then 165 if left_vip_day > 0 or MEMBER_TYPE~=0 then
166 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt; 166 --self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
167 self.remain_value=9000000;
167 else 168 else
168 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt; 169 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
169 end 170 end
...@@ -174,7 +175,7 @@ function PetPkResultView:onAgain() ...@@ -174,7 +175,7 @@ function PetPkResultView:onAgain()
174 end 175 end
175 self:close(); 176 self:close();
176 else 177 else
177 Alert.showOne("今日挑战次数已用完\n明天再来哦"); 178 Alert.showOne("成为会员每日无限制pk次数限制");
178 end 179 end
179 end 180 end
180 181
......
...@@ -28,5 +28,16 @@ ...@@ -28,5 +28,16 @@
28 <LastRunType Value="Windows" /> 28 <LastRunType Value="Windows" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/xyx/XyxRewardLayer.csd" />
35 <FilePathData Path="ui/Activity/ActivityVip.csd" />
36 <FilePathData Path="ui/pet/PetPkScene.csd" />
37 <FilePathData Path="ui/pet/PetFightOptionLayer.csd" />
38 </OpenedDocuments>
39 <ActiveDocument Path="ui/pet/PetFightOptionLayer.csd" />
40 </Value>
41 </Item>
31 </Properties> 42 </Properties>
32 </UserData> 43 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......