Skip to content

金学艇 / xhx

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

0723

1 parent 21b032a8
Inline Side-by-side
Showing 25 changed files with 342 additions and 445 deletions
......@@ -3,7 +3,7 @@
<!--m0800279afc6c-->
<!--m0800278b87c2-->
<!---->
<Account>m0800278b87c21</Account>
<Account>m0800278b87c87</Account>
<exp>0</exp>
<versionnum>201801291657</versionnum>
<isMusic>0</isMusic>
......@@ -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>1030100010142926</uid>
<uid>1010100010254572</uid>
<is_bird_game_guide>1</is_bird_game_guide>
<bird_best>1107</bird_best>
<is_haidao_game_guide>1</is_haidao_game_guide>
......
......@@ -45,7 +45,7 @@
<!--每日PK次数上限-->
<common id="23" val="10"/>
<!--每日vip,PK次数上限-->
<common id="24" val="15"/>
<common id="24" val="9999999"/>
<!--是否开启vip-->
<common id="10000" val="1"/>
......
......@@ -2297,7 +2297,7 @@
flag:1:使用指定的宠物组.0:按照参数随机(默认0)
-->
<user id="1001" name="对手1001" pk_val="500" petstar="0,0" lv="0,0" skill="0" flag="1">
<user id="1001" name="对手1001" pk_val="100" petstar="0,0" lv="0,0" skill="0" flag="1">
<!--
id//id
lv//等级
......@@ -2308,15 +2308,25 @@
-->
<pet id="10001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
<pet id="10002" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
<pet id="10003" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
<pet id="10004" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
<pet id="10005" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
<pet id="10006" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
<pet id="10008" lv="1" skill_id="4000" ack="2" hp="4" congming="10"/>
<pet id="10010" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
<pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
<pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
<pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
<pet id="20006" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
<pet id="20009" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
<pet id="20010" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
<pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
<pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
<pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
<pet id="30008" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
<pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
<pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
</user>
<user id="1002" name="对手1002" pk_val="1000" petstar="0,0" lv="0,0" skill="0" flag="0">
<user id="1002" name="对手1002" pk_val="500" petstar="0,0" lv="0,0" skill="0" flag="0">
<!--
id//id
lv//等级
......@@ -2418,7 +2428,7 @@
</user>
<user id="1003" name="对手1003" pk_val="2000" petstar="0,0" lv="1,1" skill="1" flag="0">
<user id="1003" name="对手1003" pk_val="9999999" petstar="0,0" lv="3,1" skill="1" flag="0">
<!--
id//id
lv//等级
......@@ -2566,154 +2576,5 @@
</user>
<user id="1004" name="对手1004" pk_val="9999999" petstar="1,1" lv="1,1" skill="1" flag="0">
<!--
id//id
lv//等级
skill_id//解锁技能ID
ack//攻击力
hp//血
congming//聪明
-->
<pet id="10001" lv="8" skill_id="3006" ack="2" hp="4" congming="80"/>
<pet id="10002" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
<pet id="10003" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
<pet id="10004" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
<pet id="10005" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
<pet id="10006" lv="8" skill_id="3003" ack="1" hp="6" congming="80"/>
<pet id="10007" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
<pet id="10008" lv="8" skill_id="4000" ack="2" hp="4" congming="80"/>
<pet id="10009" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
<pet id="10010" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
<pet id="10011" lv="8" skill_id="4002" ack="2" hp="5" congming="80"/>
<pet id="10012" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
<pet id="10013" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
<pet id="10014" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
<pet id="10015" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
<pet id="10016" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
<pet id="10017" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
<pet id="10018" lv="8" skill_id="4007" ack="2" hp="6" congming="80"/>
<pet id="10019" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
<pet id="10020" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
<pet id="10021" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
<pet id="10022" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="10023" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="10024" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
<pet id="10027" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
<pet id="10029" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
<pet id="10032" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
<pet id="10052" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
<pet id="10057" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
<pet id="10058" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
<pet id="20001" lv="8" skill_id="3006" ack="2" hp="4" congming="80"/>
<pet id="20002" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
<pet id="20003" lv="8" skill_id="4002" ack="2" hp="6" congming="80"/>
<pet id="20004" lv="8" skill_id="4007" ack="1" hp="6" congming="80"/>
<pet id="20005" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
<pet id="20006" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
<pet id="20007" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
<pet id="20008" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
<pet id="20009" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
<pet id="20010" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
<pet id="20011" lv="8" skill_id="1009" ack="1" hp="6" congming="80"/>
<pet id="20012" lv="8" skill_id="3007" ack="1" hp="1" congming="80"/>
<pet id="20013" lv="8" skill_id="3001" ack="2" hp="4" congming="80"/>
<pet id="20014" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
<pet id="20015" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
<pet id="20016" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
<pet id="20017" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
<pet id="20018" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
<pet id="20019" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
<pet id="20020" lv="8" skill_id="3003" ack="1" hp="6" congming="80"/>
<pet id="20021" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
<pet id="20022" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
<pet id="20023" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
<pet id="20024" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="20025" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
<pet id="20026" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
<pet id="20028" lv="8" skill_id="1004" ack="2" hp="1" congming="80"/>
<pet id="20029" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
<pet id="20035" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
<pet id="20038" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
<pet id="20046" lv="8" skill_id="1010" ack="2" hp="5" congming="80"/>
<pet id="20047" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
<pet id="20048" lv="8" skill_id="3000" ack="2" hp="4" congming="80"/>
<pet id="30001" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
<pet id="30003" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
<pet id="30004" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
<pet id="30005" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
<pet id="30006" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
<pet id="30007" lv="8" skill_id="4007" ack="1" hp="6" congming="80"/>
<pet id="30008" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
<pet id="30009" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
<pet id="30010" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
<pet id="30011" lv="8" skill_id="4002" ack="2" hp="5" congming="80"/>
<pet id="30012" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
<pet id="30013" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
<pet id="30014" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
<pet id="30016" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
<pet id="30017" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
<pet id="30018" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
<pet id="30019" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
<pet id="30020" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
<pet id="30021" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
<pet id="30022" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
<pet id="30026" lv="8" skill_id="1010" ack="2" hp="5" congming="80"/>
<pet id="30027" lv="8" skill_id="3000" ack="2" hp="4" congming="80"/>
<pet id="30028" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="30029" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
<pet id="30036" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
<pet id="30037" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
<pet id="30038" lv="8" skill_id="2002" ack="1" hp="6" congming="80"/>
<pet id="30039" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
<pet id="30040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
<pet id="10023" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="10024" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
<pet id="10025" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
<pet id="10026" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
<pet id="10028" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
<pet id="10031" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
<pet id="10034" lv="8" skill_id="4002" ack="3" hp="5" congming="80"/>
<pet id="10035" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
<pet id="10043" lv="8" skill_id="3000" ack="3" hp="6" congming="80"/>
<pet id="10047" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
<pet id="10053" lv="8" skill_id="2007" ack="3" hp="6" congming="80"/>
<pet id="10054" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
<pet id="10056" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
<pet id="20030" lv="8" skill_id="4001" ack="1" hp="10" congming="80"/>
<pet id="20031" lv="8" skill_id="2007" ack="3" hp="6" congming="80"/>
<pet id="20032" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="20033" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
<pet id="20034" lv="8" skill_id="4000" ack="2" hp="6" congming="80"/>
<pet id="20036" lv="8" skill_id="3006" ack="2" hp="6" congming="80"/>
<pet id="20037" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
<pet id="20039" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
<pet id="20040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
<pet id="20042" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
<pet id="20043" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
<pet id="20044" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
<pet id="20045" lv="8" skill_id="4004" ack="2" hp="7" congming="80"/>
<pet id="20049" lv="8" skill_id="1017" ack="4" hp="8" congming="80"/>
<pet id="20051" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
<pet id="20052" lv="8" skill_id="1018" ack="4" hp="5" congming="80"/>
<pet id="20053" lv="8" skill_id="1017" ack="2" hp="8" congming="80"/>
<pet id="30002" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
<pet id="30030" lv="8" skill_id="4002" ack="3" hp="5" congming="80"/>
<pet id="30031" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
<pet id="30032" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
<pet id="30033" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
<pet id="30034" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
<pet id="30035" lv="8" skill_id="1017" ack="4" hp="8" congming="80"/>
<pet id="30040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
<pet id="30042" lv="8" skill_id="4000" ack="2" hp="6" congming="80"/>
<pet id="30043" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
<pet id="30047" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
<pet id="30048" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
<pet id="30049" lv="8" skill_id="4001" ack="2" hp="9" congming="80"/>
<pet id="30050" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
</user>
</ai>
</root>
......
......@@ -36,6 +36,6 @@
<step id="1" reward="100001,100"/>
</task>
<task id="10" name="购买钻石" pic="icon_diamond.png" desc="购买钻石1次">
<step id="1" reward="100001,100"/>
<step id="1" reward="100001,1000"/>
</task>
</root>
\ No newline at end of file
......
......@@ -39,6 +39,9 @@ function SingleGameInfo.get_game_info(id)
for i,v in ipairs(_list) do
if v.id == id then
info = v;
if v.id==10 and CHANNEL=="ws" then
info.name="火箭小象";
end
end
end
return info;
......
......@@ -8,19 +8,15 @@ local runningScene = nil;
local lastPopTime = 0;
local function showPopItem()
logUI("6666");
if not isPopping then
logUI("7777= "..#queuePopList);
if #queuePopList > 0 then
isPopping = true;
logUI("11111");
local obj = queuePopList[1];
table.remove(queuePopList,1);
local PopItem = cc.CSLoader:createNode("ui/PopItem.csb");
local rect = PopItem:getBoundingBox();
PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
logUI("2222");
local icon = PopItem:getChildByName("icon");
icon:loadTexture("res/icon/"..obj.id..".png");
local item_amount = PopItem:getChildByName("item_amount");
......@@ -28,7 +24,6 @@ logUI("6666");
item_amount:setString(itemInfo.name.."* "..obj.num);
runningScene:addChild(PopItem,dialog.ZORDER_POP+1);
logUI("33333");
local function fadeOutBack()
PopItem:removeSelf();
......@@ -41,14 +36,10 @@ logUI("6666");
local moveBy = cc.MoveBy:create(1, cc.p(0, 200));
PopItem:runAction(moveBy);
PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack)));
logUI("4444");
local function nextPopFun()
isPopping = false;
logUI("0000");
showPopItem();
end
logUI("5555");
print("ItemManater showPopItem==================",runningScene);
runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun)));
end
end
......@@ -65,7 +56,6 @@ function ItemManager.addPopItem(ID,num)
runningScene = cc.Director:getInstance():getRunningScene();
end
queuePopList[#queuePopList+1] = obj;
print("ItemManager runningScene================ ",runningScene);
-- if ID == 100001 then
-- ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold"))
......
......@@ -170,16 +170,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -123,16 +123,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -123,16 +123,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -159,16 +159,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -129,16 +129,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -117,16 +117,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -117,16 +117,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -169,16 +169,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -170,16 +170,19 @@ function GameStartView:onStart()
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
......
......@@ -6,12 +6,14 @@ function PetPkScene:ctor(params)
end
function PetPkScene:onCreate(params)
ItemManager.lock_pop = false; --恢复弹窗
--GameConfig.pk_num; --每日PK次数上限
--GameConfig.pk_num_vip; --每日VIP，pk次数上限
--UserModel.user_info.pk_daily_cnt; --今日已pk次数
local left_vip_day = UserModel.getLeftVipDay();
if left_vip_day > 0 then
GameConfig.pk_num_vip=GameConfig.pk_num_vip-1;
if left_vip_day > 0 or MEMBER_TYPE~=0 then
--GameConfig.pk_num_vip=GameConfig.pk_num_vip-1; --会员无限次
GameConfig.pk_num_vip=9000000;
else
GameConfig.pk_num=GameConfig.pk_num-1;
end
......
local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb",import("..view.BaseViewNew"));
local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb", import("..view.BaseViewNew"));
local game_data = require("app/views/shuyishu/game_data");
local ox,oy = 1050,128;
local ox, oy = 1050, 128;
function GameStartView:ctor()
GameStartView.super.ctor(self);
end
......@@ -20,16 +20,16 @@ function GameStartView:show(onStartFn)
end
function GameStartView:init()
self:setContentSize(cc.size(display.width,display.height));
self:setContentSize(cc.size(display.width, display.height));
ccui.Helper:doLayout(self);
local btn_start = self:getChildByName("btn_start");
btn_start.fn = handler(self,self.onStart);
btn_start:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_start.fn)end);
btn_start.fn = handler(self, self.onStart);
btn_start:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_start.fn) end);
local btn_introduce = self:getChildByName("btn_introduce");
btn_introduce.fn = handler(self,self.onIntroduce);
btn_introduce:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_introduce.fn)end);
btn_introduce.fn = handler(self, self.onIntroduce);
btn_introduce:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_introduce.fn) end);
self.bg_mask = self:getChildByName("bg_mask");
self.bg_mask:hide();
......@@ -37,11 +37,11 @@ function GameStartView:init()
self.game_introduce:setLocalZOrder(100);
self.game_introduce:hide();
self.nodes[1] = {btn_start,btn_introduce};
self.nodes[1] = { btn_start, btn_introduce };
self:updateSelectedState(btn_start);
if IS_XHX then
btn_introduce:setPosition(cc.p(80,display.height-80));
btn_introduce:setPosition(cc.p(80, display.height - 80));
self:initRankView();
end
end
......@@ -49,43 +49,43 @@ end
function GameStartView:initRankView()
self.rankView = cc.CSLoader:createNode("ui/xyx/XyxRankLayer.csb");
local rect = self.rankView:getContentSize();
self.rankView:setPosition(cc.p(display.width-rect.width-20,20));
self.rankView:setPosition(cc.p(display.width - rect.width - 20, 20));
self:addChild(self.rankView);
for i=1,8 do
self.rankView:getChildByName("item_"..i):setVisible(false);
for i = 1, 8 do
self.rankView:getChildByName("item_" .. i):setVisible(false);
end
self.onRankResFun = handler(self,self.onRankRes);
cmsg.on("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
SocketClient:getInstance():send("gateway_msg.single_game_rank_msg",{id = EnumGame.SHUYISHU});
self.onRankResFun = handler(self, self.onRankRes);
cmsg.on("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
SocketClient:getInstance():send("gateway_msg.single_game_rank_msg", { id = EnumGame.SHUYISHU });
end
function GameStartView:onRankRes(params)
cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
self.rank_list = params.data.game_rank.rank_user;
for i=1,8 do
local item = self.rankView:getChildByName("item_"..i);
for i = 1, 8 do
local item = self.rankView:getChildByName("item_" .. i);
if self.rank_list[i] then
item:setVisible(true);
if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then
item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick,12).."...");
item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick, 12) .. "...");
else
item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick);
end
if i > 3 then
item:getChildByName("txt"):setColor(cc.c3b(255,165,0));
item:getChildByName("txt_score"):setColor(cc.c3b(255,165,0));
item:getChildByName("txt"):setColor(cc.c3b(255, 165, 0));
item:getChildByName("txt_score"):setColor(cc.c3b(255, 165, 0));
end
item:getChildByName("txt_score"):setString(self.rank_list[i].val);
local btn = item:getChildByName("btn");
btn.user_show = self.rank_list[i].user_show;
btn.fn = function ()
btn.fn = function()
self:onOpenUserInfo(btn);
end;
btn:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onOpenUserInfo))end);
self.nodes[1][#self.nodes[1]+1] = btn;
btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onOpenUserInfo)) end);
self.nodes[1][#self.nodes[1] + 1] = btn;
else
item:setVisible(false);
end
......@@ -99,26 +99,26 @@ function GameStartView:onOpenUserInfo(ref)
end
function GameStartView:move()
if self.moveIndex <= #self.path and self.moveIndex >=1 then
if self.moveIndex <= #self.path and self.moveIndex >= 1 then
local nextPoint = self.path[self.moveIndex];
self.star:setPosition(nextPoint.x+ox,-nextPoint.y+oy);
self.star:setPosition(nextPoint.x + ox, - nextPoint.y + oy);
self.moveIndex = self.moveIndex + 1;
else
self:stopAction(self.repeatForver);
self.repeatForver = nil;
self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5),cc.CallFunc:create(function()
self.star:setPosition(cc.p(ox,oy));
self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5), cc.CallFunc:create( function()
self.star:setPosition(cc.p(ox, oy));
self.star:hide();
end)));
end )));
self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.CallFunc:create(function()
self:runAction(cc.Sequence:create(cc.DelayTime:create(3), cc.CallFunc:create( function()
self.star:show();
self.moveIndex = 1;
self.repeatForver = schedule(self,handler(self,self.move),0);
self.repeatForver = schedule(self, handler(self, self.move), 0);
SoundManager.playEffect("res/ui/shuyishu/magic.mp3");
end)));
end )));
end
end
......@@ -130,52 +130,56 @@ function GameStartView:onStart()
self:close();
end
GAME_ID=EnumGame.SHUYISHU;
GAME_ID = EnumGame.SHUYISHU;
if IS_XHX then
local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU);
print("打开小游戏：",game_info.id);
print("打开小游戏：", game_info.id);
if UserModel.getLeftVipDay() == 0 then
print("小游戏购买界面");
local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
if free_every_day_num.val1==0 then
local free_every_day_num = UserModel.getSingleGameById(game_info.id);
-- 今天的免费次数是否用完
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();
else
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL=="cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
local function okFun()
if CHANNEL == "shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "cucc" then
local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
end
return;
else
paySuccessFun();
end
elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
local reciever = require("app.views.shuyishu.GamePayView"):show("",paySuccessFun);
local reciever = require("app.views.shuyishu.GamePayView"):show("", paySuccessFun);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
elseif CHANNEL == "ws" then
local unlock_price = 9.9;
local function onPaySuccessCallBack(result)
if result == "success" then
UmengHelper.pay(unlock_price.."&1");
UmengHelper.pay(unlock_price .. "&1");
game_data.set_is_vip(1);
self:onStart();
end
end
local function okPayFun()
UmengHelper.onEvent("unlock_click");
ShopModel.pay("tjlhxkgxyx_unlock","永久解锁",unlock_price,onPaySuccessCallBack,timeoutCallBack);
ShopModel.pay("tjlhxkgxyx_unlock", "永久解锁", unlock_price, onPaySuccessCallBack, timeoutCallBack);
end
if game_data.get_is_vip() == 0 and game_data.get_game_play_cnt() >= 3 then
local receiver = require("app.views.view.AlertView"):show({msg="您的免费试玩已结束，是否花"..unlock_price.."元付费解锁？"},okPayFun,nil,1);
local receiver = require("app.views.view.AlertView"):show( { msg = "您的免费试玩已结束，是否花" .. unlock_price .. "元付费解锁？" }, okPayFun, nil, 1);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
return;
else
......@@ -198,27 +202,27 @@ end
function GameStartView:close()
if IS_XHX then
cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
end
GameStartView.super.close(self);
end
--返回键处理函数
-- 返回键处理函数
function GameStartView:onKeypadBack()
if not IS_XHX then
local function okFun()
cc.Director:getInstance():endToLua();
end
local receiver = require("app.views.view.AlertView"):show({msg="确定要退出游戏？"},okFun,cancelFun,2);
local receiver = require("app.views.view.AlertView"):show( { msg = "确定要退出游戏？" }, okFun, cancelFun, 2);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
else
cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun);
app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.XyxView"});
cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
app:enterScene("LoadingScene", { nextSceneName = "MainScene", class_name = "app.views.view.XyxView" });
end
end
--隐藏按键
-- 隐藏按键
function GameStartView:onKeypadSecrect()
if not self.game_introduce:isVisible() then
return;
......@@ -227,7 +231,7 @@ function GameStartView:onKeypadSecrect()
clearLogUI();
if DEBUG == 0 then
DEBUG = 1;
logUI("进入调试模式：");
if CHANNEL == "shdx" then
self.auto_pay_index = 0;
......@@ -253,17 +257,23 @@ function GameStartView:autoPay()
self.auto_pay_index = 0;
clearLogUI();
end
local tradeNo = tostring(os.time())..math.random(10000,99999); --订单号
local productId = PAY_ID_SHDX; --商品ID
local subject = PAY_PRICE_SHDX.."元体验游戏"; --商品名称
local amount = PAY_PRICE_SHDX; --商品价格
local notificationURL = "http://www.baidu.com";--回调URL
local peng_bo_shi_token = "123";--鹏博士密钥
local tradeNo = tostring(os.time()) .. math.random(10000, 99999);
-- 订单号
local productId = PAY_ID_SHDX;
-- 商品ID
local subject = PAY_PRICE_SHDX .. "元体验游戏";
-- 商品名称
local amount = PAY_PRICE_SHDX;
-- 商品价格
local notificationURL = "http://www.baidu.com";
-- 回调URL
local peng_bo_shi_token = "123";
-- 鹏博士密钥
local function callbackLua(params)
if params == "success" then
if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=102,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX});
HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 102, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
end
logUI("...*");
else
......@@ -272,24 +282,24 @@ function GameStartView:autoPay()
end
local function payCallbackFromJava(params)
delayCall(0.5,function()
delayCall(0.5, function()
callbackLua(params);
end);
end );
end
logUI("...");
local pay_params = tradeNo..","..productId..","..subject..","..amount..","..notificationURL..","..peng_bo_shi_token;
DeviceUtil.sendBilling(pay_params,payCallbackFromJava);
local pay_params = tradeNo .. "," .. productId .. "," .. subject .. "," .. amount .. "," .. notificationURL .. "," .. peng_bo_shi_token;
DeviceUtil.sendBilling(pay_params, payCallbackFromJava);
if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=101,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX});
HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 101, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
end
self.auto_pay_index = self.auto_pay_index + 1;
math.randomseed(tostring(os.time()+self.auto_pay_index):reverse():sub(1,6));
self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532,1196)*0.01),cc.CallFunc:create(function()
math.randomseed(tostring(os.time() + self.auto_pay_index):reverse():sub(1, 6));
self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532, 1196) * 0.01), cc.CallFunc:create( function()
self:autoPay();
end)));
end )));
end
return GameStartView
\ No newline at end of file
......
......@@ -127,6 +127,9 @@ function AchievementView:updateItems()
if _list[i] and _list[i].viewid==5 then
table.remove(_list,i);
end
if _list[i] and _list[i].viewid==11 then
table.remove(_list,i);
end
end
end
......@@ -351,6 +354,9 @@ function AchievementView:setScrollPosition(node)
if _list[i] and _list[i].viewid==5 then
table.remove(_list,i);
end
if _list[i] and _list[i].viewid==11 then
table.remove(_list,i);
end
end
end
......
--活动，小游戏周赛
local ActivityMatchView = dialog.uinode("ui/Activity/ActivityMatchLayer.csb",import(".BaseView"))
-- 活动，小游戏周赛
local ActivityMatchView = dialog.uinode("ui/Activity/ActivityMatchLayer.csb", import(".BaseView"))
function ActivityMatchView:ctor(id,_update_nodes_func)
function ActivityMatchView:ctor(id, _update_nodes_func)
self.id = id;
self.update_nodes_func = _update_nodes_func;
self.info = RankExprieRewardInfo.getInfoByID(self.id); --根据id获取周排行信息
self.info = RankExprieRewardInfo.getInfoByID(self.id);
-- 根据id获取周排行信息
self.my_rank = 0;
ActivityMatchView.super.ctor(self);
end
function ActivityMatchView:init()
self.nodes = {};
self:getChildByName("bg_match_8"):setVisible(false); --旋转海盗
self:getChildByName("bg_match_9"):setVisible(false); --飞檐走壁
self:getChildByName("bg_match_5"):setVisible(false); --接糖果
self:getChildByName("bg_match_7"):setVisible(false); --奔跑吧小兔子
self:getChildByName("bg_match_3"):setVisible(false); --猜猜我是谁
if CHANNEL=="shdx" then
self.nodes = { };
self:getChildByName("bg_match_8"):setVisible(false);
-- 旋转海盗
self:getChildByName("bg_match_9"):setVisible(false);
-- 飞檐走壁
self:getChildByName("bg_match_5"):setVisible(false);
-- 接糖果
self:getChildByName("bg_match_7"):setVisible(false);
-- 奔跑吧小兔子
self:getChildByName("bg_match_3"):setVisible(false);
-- 猜猜我是谁
if CHANNEL == "shdx" then
self:getChildByName("bg_match_9"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_9_shdx.png"):getSpriteFrame());
self:getChildByName("bg_match_5"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/match_10_girl_shdx.png"):getSpriteFrame());
self:getChildByName("bg_match_7"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/rabbit_shdx.png"):getSpriteFrame());
......@@ -28,29 +34,29 @@ function ActivityMatchView:init()
self.rankView = self:getChildByName("rankView");
self.btn_start_game = self:getChildByName("btn_start_game");
self.btn_start_game.fn = function ()
self.btn_start_game.fn = function()
self:onStartGameClick(self.btn_start_game);
end
self.btn_start_game:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onStartGameClick))end);
self.btn_start_game:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onStartGameClick)) end);
self.btn_lingqu = self:getChildByName("btn_lingqu");
self.btn_lingqu.fn = function ()
self.btn_lingqu.fn = function()
self:onLingquClick(self.btn_lingqu);
end
self.btn_lingqu:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onLingquClick))end);
self.btn_lingqu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
self.yilingqu = self:getChildByName("yilingqu");
self.yilingqu:setVisible(false);
self.btn_reward = self:getChildByName("btn_reward");
self.btn_reward.fn = function ()
self.btn_reward.fn = function()
self:onRewardClick(self.btn_reward);
end
self.btn_reward:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onRewardClick))end);
self.btn_reward:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onRewardClick)) end);
self:update();
self.get_reward = 0;
EventListener.addEventListener(self,EnumEvent.ACT_MATCH_RANK_RES,handler(self,self.onActMatchRankRes));
EventListener.addEventListener(self, EnumEvent.ACT_MATCH_RANK_RES, handler(self, self.onActMatchRankRes));
ActivityModel.getMatchRankMsg(self.id);
return self.nodes;
......@@ -62,18 +68,18 @@ function ActivityMatchView:onActMatchRankRes(eve)
self.get_reward = eve.data.get_reward;
if UserModel.time_second < self.info.end_time then
self.nodes[1] = {self.btn_start_game,self.btn_reward};
self.nodes[1] = { self.btn_start_game, self.btn_reward };
self.btn_lingqu:setVisible(false);
else
self.btn_start_game:setVisible(false);
if self.get_reward == 1 then
self.btn_lingqu:setVisible(false);
self.yilingqu:setVisible(true);
self.nodes[1] = {self.btn_reward};
self.nodes[1] = { self.btn_reward };
else
self.nodes[1] = {self.btn_lingqu,self.btn_reward};
self.nodes[1] = { self.btn_lingqu, self.btn_reward };
end
end
if self.update_nodes_func then
......@@ -83,44 +89,44 @@ function ActivityMatchView:onActMatchRankRes(eve)
end
function ActivityMatchView:update(id)
--local startDayDate = os.date("*t",self.info.start_time);
--local endDayDate = os.date("*t",self.info.end_time);
--self:getChildByName("txt_time"):setString(startDayDate.month.."月"..startDayDate.day.."日-"..endDayDate.month.."月"..endDayDate.day.."日");
--修改为排名场次文字，不在使用日期显示
--self:getChildByName("bg"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_"..self.info.gameid..".png"):getSpriteFrame());
self:getChildByName("bg_match_"..self.info.gameid):setVisible(true);
-- local startDayDate = os.date("*t",self.info.start_time);
-- local endDayDate = os.date("*t",self.info.end_time);
-- self:getChildByName("txt_time"):setString(startDayDate.month.."月"..startDayDate.day.."日-"..endDayDate.month.."月"..endDayDate.day.."日");
-- 修改为排名场次文字，不在使用日期显示
-- self:getChildByName("bg"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_"..self.info.gameid..".png"):getSpriteFrame());
self:getChildByName("bg_match_" .. self.info.gameid):setVisible(true);
end
function ActivityMatchView:updateRankView()
for i=1,8 do
local item = self.rankView:getChildByName("item_"..i);
for i = 1, 8 do
local item = self.rankView:getChildByName("item_" .. i);
if self.rank_list[i] then
item:setVisible(true);
if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then
item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick,12).."...");
item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick, 12) .. "...");
else
item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick);
end
if i > 3 then
item:getChildByName("txt"):setColor(cc.c3b(255,165,0));
item:getChildByName("txt_score"):setColor(cc.c3b(255,165,0));
item:getChildByName("txt"):setColor(cc.c3b(255, 165, 0));
item:getChildByName("txt_score"):setColor(cc.c3b(255, 165, 0));
end
item:getChildByName("txt_score"):setString(self.rank_list[i].val);
local btn = item:getChildByName("btn");
btn.user_show = self.rank_list[i].user_show;
btn.fn = function ()
btn.fn = function()
self:onOpenUserInfo(btn);
end;
btn:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onOpenUserInfo))end);
self.nodes[1][#self.nodes[1]+1] = btn;
btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onOpenUserInfo)) end);
self.nodes[1][#self.nodes[1] + 1] = btn;
else
item:setVisible(false);
end
end
self.my_rank = 0;
for i,v in ipairs(self.rank_list) do
for i, v in ipairs(self.rank_list) do
if v.user_show.uid == UserModel.user_info.uid then
self.my_rank = i;
break;
......@@ -129,9 +135,9 @@ function ActivityMatchView:updateRankView()
if self.my_rank == 0 then
self:getChildByName("txt_rank"):setString("我的排名：未上榜");
else
self:getChildByName("txt_rank"):setString("我的排名："..self.my_rank);
self:getChildByName("txt_rank"):setString("我的排名：" .. self.my_rank);
end
self:getChildByName("txt_cnt"):setString("参与场次："..self.my_cnt);
self:getChildByName("txt_cnt"):setString("参与场次：" .. self.my_cnt);
end
function ActivityMatchView:onOpenUserInfo(ref)
......@@ -143,34 +149,45 @@ end
function ActivityMatchView:onStartGameClick(ref)
app:enterMiniGame(self.info.gameid);
-- if self.info.gameid == EnumGame.CAKE then
-- app:enterMiniGameScene("cake.LoadingScene");
-- elseif self.info.gameid == EnumGame.FANPAI then
-- app:enterMiniGameScene("fanpai.LoadingScene");
-- elseif self.info.gameid == EnumGame.GUESS then
-- app:enterMiniGameScene("guess.LoadingScene");
-- elseif self.info.gameid == EnumGame.GUESS_COLOR then
-- app:enterMiniGameScene("guesscolor.LoadingScene");
-- elseif self.info.gameid == EnumGame.CANDY then
-- app:enterMiniGameScene("candy.LoadingScene");
-- elseif self.info.gameid == EnumGame.SHUYISHU then
-- app:enterMiniGameScene("shuyishu.LoadingScene");
-- elseif self.info.gameid == EnumGame.RABBIT then
-- app:enterMiniGameScene("run.LoadingScene");
-- elseif self.info.gameid == EnumGame.HAIDAO then
-- app:enterMiniGameScene("haidao.LoadingScene");
-- elseif self.info.gameid == EnumGame.FEIYANZOUBI then
-- app:enterMiniGameScene("feiyanzoubi.LoadingScene");
-- elseif self.info.gameid == EnumGame.BIRD then
-- app:enterMiniGameScene("bird.LoadingScene");
-- end
-- if self.info.gameid == EnumGame.CAKE then
-- app:enterMiniGameScene("cake.LoadingScene");
-- elseif self.info.gameid == EnumGame.FANPAI then
-- app:enterMiniGameScene("fanpai.LoadingScene");
-- elseif self.info.gameid == EnumGame.GUESS then
-- app:enterMiniGameScene("guess.LoadingScene");
-- elseif self.info.gameid == EnumGame.GUESS_COLOR then
-- app:enterMiniGameScene("guesscolor.LoadingScene");
-- elseif self.info.gameid == EnumGame.CANDY then
-- app:enterMiniGameScene("candy.LoadingScene");
-- elseif self.info.gameid == EnumGame.SHUYISHU then
-- app:enterMiniGameScene("shuyishu.LoadingScene");
-- elseif self.info.gameid == EnumGame.RABBIT then
-- app:enterMiniGameScene("run.LoadingScene");
-- elseif self.info.gameid == EnumGame.HAIDAO then
-- app:enterMiniGameScene("haidao.LoadingScene");
-- elseif self.info.gameid == EnumGame.FEIYANZOUBI then
-- app:enterMiniGameScene("feiyanzoubi.LoadingScene");
-- elseif self.info.gameid == EnumGame.BIRD then
-- app:enterMiniGameScene("bird.LoadingScene");
-- end
end
function ActivityMatchView:onLingquClick(ref)
if self.get_reward == 0 then
SocketClient:getInstance():send("gateway_msg.single_exprie_game_rank_reward_msg",{id = self.info.id});
local receiver = require("app.views.view.ActivityMatchLingquView"):show(self.info,self.my_rank,self.my_cnt);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
local list = self.info.list;
local flag=false;
for i = 1, 4 do
if self.my_rank >= list[i].noBegin and self.my_rank <= list[i].noEnd then
SocketClient:getInstance():send("gateway_msg.single_exprie_game_rank_reward_msg", { id = self.info.id });
local receiver = require("app.views.view.ActivityMatchLingquView"):show(self.info, self.my_rank, self.my_cnt);
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
else
flag=true;
end
end
if flag then
Alert.showOne("上周没有可领取的排行榜奖励");
end
else
Alert.showOne("奖励已领取");
end
......
......@@ -52,12 +52,6 @@ function ActivityVipView:init()
UmengHelper.onEvent("activity_vip_show");
self.yilingqu_month:setVisible(false);
self.yilingqu_year:setVisible(false);
self.btn_lingqu_month:setVisible(false);
self.btn_vip_year:setVisible(false);
self.btn_lingqu_year:setVisible(false);
return self:update(true);
end
......@@ -84,14 +78,18 @@ function ActivityVipView:checkVipReward()
end
function ActivityVipView:update(_is_init)
self.btn_vip_year:setVisible(false);
self.btn_vip_lianxu:setVisible(false);
self.yilingqu_month:setVisible(false);
self.yilingqu_year:setVisible(false);
self.btn_lingqu_month:setVisible(false);
self.btn_lingqu_year:setVisible(false);
local vipList = ShopInfo.getVipList();
local _nodes = { };
-- 包月
local vipInfo1 = vipList[1];
-- 连续包月
local vipInfo3 = vipList[3];
local itemList1 = vipInfo1.itemList;
for i = 1, 2 do
......@@ -114,11 +112,6 @@ function ActivityVipView:update(_is_init)
local data1 = UserModel.getVipByID(vipInfo1.id);
if data1 and data1.val2 >= UserModel.time_second then
has_vip_month = true;
elseif vipInfo3 then
local data3 = UserModel.getVipByID(vipInfo3.id);
if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
has_vip_month = true;
end
end
local data1 = UserModel.getVipByID(vipInfo1.id);
......@@ -143,45 +136,14 @@ function ActivityVipView:update(_is_init)
self.yilingqu_month:setVisible(true);
end
elseif not has_vip_month then
if vipInfo3 then
-- self.btn_vip_month:setVisible(true);
-- _nodes[1] = { self.btn_vip_month };
self.btn_vip_lianxu:setVisible(true);
if #_nodes > 0 then
_nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
else
-- self.btn_vip_month_single:setVisible(true);
-- _nodes[1] = { self.btn_vip_month_single };
_nodes[1] = { self.btn_vip_lianxu };
end
end
if vipInfo3 then
local data3 = UserModel.getVipByID(vipInfo3.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 = vipInfo3.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
elseif not has_vip_month then
--[[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 #_nodes > 0 then
_nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
else
_nodes[1] = { self.btn_vip_lianxu };
end
-- 包年
local vipInfo2 = vipList[2];
local itemList2 = vipInfo2.itemList;
......
......@@ -526,9 +526,13 @@ function FriendView:onPkClick(ref)
UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
paySuccessFun();
else
logUI("shdx------------------>");
local reciever = nil;
if CHANNEL=="cucc" then
reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
elseif CHANNEL=="shdx" then
logUI("shdx2222------------------>");
reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
else
reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
end
......
......@@ -15,9 +15,11 @@ function PetFightView:init(_nodes,_update_nodes_func)
--UserModel.user_info.pk_daily_cnt; --今日已pk次数
local left_vip_day = UserModel.getLeftVipDay();
self.remain_value=0;
if left_vip_day > 0 then
if left_vip_day > 0 or MEMBER_TYPE~=0 then
self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt));
--self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt));
self:getChildByName("pk_num"):setString("今日剩余次数：无限");
self.remain_value=9000000;
else
self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt));
......@@ -162,13 +164,14 @@ function PetFightView:onScoreFightClick()
local team_v = UserModel.get_pet_team_by_id(UserModel.team_id);
if self.remain_value<=0 then
Alert.showOne("今日挑战次数已用完\n明天再来哦");
Alert.showOne("成为会员每日无限制pk次数限制");
return;
elseif #team_v.pet_id == 4 then
self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun);
cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun);
self.notifyGameEndCallbackFun = handler(self,self.onNotifyGameEndCallBackFun);
ItemManager.lock_pop = true; --关掉弹窗
cmsg.on("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
SocketClient:getInstance():send("gateway_msg.lobby_enter_msg",{pet_id = team_v.pet_id});
......
......@@ -162,8 +162,9 @@ end
function PetPkResultView:onAgain()
local left_vip_day = UserModel.getLeftVipDay();
self.remain_value=0;
if left_vip_day > 0 then
self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
if left_vip_day > 0 or MEMBER_TYPE~=0 then
--self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
self.remain_value=9000000;
else
self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
end
......@@ -174,7 +175,7 @@ function PetPkResultView:onAgain()
end
self:close();
else
Alert.showOne("今日挑战次数已用完\n明天再来哦");
Alert.showOne("成为会员每日无限制pk次数限制");
end
end
......
......@@ -28,5 +28,16 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/xyx/XyxRewardLayer.csd" />
<FilePathData Path="ui/Activity/ActivityVip.csd" />
<FilePathData Path="ui/pet/PetPkScene.csd" />
<FilePathData Path="ui/pet/PetFightOptionLayer.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/pet/PetFightOptionLayer.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......