Commit fe27a2a7 fe27a2a71ae5ae6bac21ef6fadee962cc9a741fc by jinwawa

0723

1 parent 21b032a8
......@@ -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"/>
......
......@@ -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
......
......@@ -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
......
......@@ -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
......