Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 3d0bb0dc 3d0bb0dc871b2433c22058e430d2293fe16ed4b1 by jinwawa
Options

0624

1 parent 19110c18
Inline Side-by-side
Showing 20 changed files with 162 additions and 218 deletions
......@@ -55,9 +55,9 @@
<reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
</type>
<type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
<reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/>
<reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
</type>
<level id="1" cnt="2" item="100001,200"/>
......
......@@ -55,9 +55,9 @@
<reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
</type>
<type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
<reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/>
<reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
</type>
<level id="1" cnt="2" item="100001,200"/>
......
......@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
100000 钻石 商店里购买 0 0 0 0 0 0 0 0
100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
100002 vip经验 vip经验 2 0 0 0 0 0 0 0
100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
100003 花 花 2 0 0 0 0 0 0 0
200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
No preview for this file type
......@@ -43,4 +43,11 @@
<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
</platform>
<!--上海电信-->
<platform id="106" channel="shdx">
<pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" payitem="" rmb="69.0" product="1000710508" productPuTao="qjqp201" notice="1"/>
<pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="299.0" product="1000710226" productPuTao="qjqp202" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" payitem="" rmb="49.0" product="1000709506" productPuTao="qjqp999" notice="1"/>
</platform>
</root>
\ No newline at end of file
......
......@@ -2290,9 +2290,13 @@
<body id="7" data="800057,800107,800127,800207,800217,800227"/>
<!-- 自动战斗对手
pk_val表示玩家pk积分在以下范围内时会匹配到该等级的机器人
petstar中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的星级要比玩家随机一个宠物大2。
lv中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的等级要比玩家随机一个宠物大2。
skill中的数字表示AI宠物的技能开启和玩家的差异。“1”代表需要比玩家多1个宠物开启了技能。
-->
<user id="1001" name="对手1001" pk_val="500">
<user id="1001" name="对手1001" pk_val="500" petstar="0,0" lv="0,0" skill="0">
<!--
id//id
lv//等级
......@@ -2362,7 +2366,7 @@
</user>
<user id="1002" name="对手1002" pk_val="1000">
<user id="1002" name="对手1002" pk_val="1000" petstar="0,0" lv="0,0" skill="1">
<!--
id//id
lv//等级
......@@ -2464,7 +2468,7 @@
</user>
<user id="1003" name="对手1003" pk_val="2000">
<user id="1003" name="对手1003" pk_val="2000" petstar="0,0" lv="1,1" skill="1">
<!--
id//id
lv//等级
......@@ -2613,7 +2617,7 @@
</user>
<user id="1004" name="对手1004" pk_val="9999999">
<user id="1004" name="对手1004" pk_val="9999999" petstar="1,1" lv="1,1" skill="1">
<!--
id//id
lv//等级
......
......@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
100000 钻石 商店里购买 0 0 0 0 0 0 0 0
100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
100002 vip经验 vip经验 2 0 0 0 0 0 0 0
100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
100003 花 花 2 0 0 0 0 0 0 0
200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
No preview for this file type
......@@ -3,7 +3,7 @@
<!--m0800279afc6c-->
<!--m0800278b87c2-->
<!---->
<Account>m0800279afc6e</Account>
<Account>m0800279afc6c09</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>376</feiyanzoubi_best>
<uid>1030100010142906</uid>
<uid>1030100010142923</uid>
<is_bird_game_guide>1</is_bird_game_guide>
<bird_best>1008</bird_best>
<is_haidao_game_guide>1</is_haidao_game_guide>
......
......@@ -55,9 +55,9 @@
<reward id="3" name="我是会员Ⅲ" des="会员等级达到8级" item="100001,5000;910069,1" data="8"/>
</type>
<type viewid="11" id="11" name="我的礼包" des="包月/包年次数">
<reward id="1" name="我的礼包Ⅰ" des="VIP包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="VIP包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="VIP包年/包月5次" item="100001,5000;910064,1" data="5"/>
<reward id="1" name="我的礼包Ⅰ" des="动漫会员包年/包月1次" item="100001,1000;910066,1" data="1"/>
<reward id="2" name="我的礼包Ⅱ" des="动漫会员包年/包月3次" item="100001,2000;910068,1" data="3"/>
<reward id="3" name="我的礼包Ⅲ" des="动漫会员包年/包月5次" item="100001,5000;910064,1" data="5"/>
</type>
<level id="1" cnt="2" item="100001,200"/>
......
......@@ -2,7 +2,7 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
物品id 名字 描述 资源id 商品ID(背包里直接购买索引到商品ID) 库存数量(废弃) 1脸2发3上衣4裤子5鞋6翅膀7玩具 道具增加宠物经验值 对应宠物星级 唯一的 0:普通1:vip
100000 钻石 商店里购买 0 0 0 0 0 0 0 0
100001 金豆 游乐场玩游戏获得 1 100 0 0 0 0 0 0
100002 vip经验 vip经验 2 0 0 0 0 0 0 0
100002 动漫会员经验 动漫会员经验 2 0 0 0 0 0 0 0
100003 花 花 2 0 0 0 0 0 0 0
200001 宠物钥匙白 游乐场玩游戏获得，可用于宠物园抓宠物 1 0 0 0 0 1 0 0
200002 宠物钥匙绿 游乐场玩游戏获得，可用于宠物园抓宠物 2 0 0 0 0 2 0 0
......
......@@ -100,13 +100,24 @@ end
function ActivityVipView:update(_is_init)
local vipList = ShopInfo.getVipList();
local flag=0; --是否订购了会员及是否领取了奖励，0，未订购，1订购，2未领取，3已领取
local _nodes = { };
-- 包月
local vipInfo1 = vipList[1];
local data1 = UserModel.getVipByID(vipInfo1.id);
--包年
local vipInfo2 = vipList[2];
local data2 = UserModel.getVipByID(vipInfo2.id);
-- 连续包月
local vipInfo3 = vipList[3];
local data3 = UserModel.getVipByID(vipInfo3.id); --包年礼包详情
--会员生效，可能是包月、续包月或包年会员之一
if (data1 and data1.val2 >= UserModel.time_second) or (data2 and data2.val2 >= UserModel.time_second) or (data3 and data3.val2 >= UserModel.time_second) then
flag=2;
end
local itemList1 = vipInfo1.itemList;
for i = 1, 2 do
......@@ -139,6 +150,7 @@ function ActivityVipView:update(_is_init)
local data1 = UserModel.getVipByID(vipInfo1.id);
if data1 and data1.val2 >= UserModel.time_second then
if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then--单包月礼包详情
flag=3;
-- 可领取
local day = math.floor((data1.val2 - UserModel.time_second) /(24 * 3600)) + 1;
if data1.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data1.val1) then
......@@ -153,10 +165,11 @@ function ActivityVipView:update(_is_init)
_nodes[1] = { self.btn_lingqu_month };
else
-- 已领取
flag=4;
self.btn_lingqu_month:setVisible(false);
self.yilingqu_month:setVisible(true);
end
else
elseif flag==0 then
self.btn_vip_month:setVisible(true); --显示包月按钮
_nodes[1] = { self.btn_vip_month };
--[[elseif not has_vip_month then --这里需要改
......@@ -174,16 +187,22 @@ function ActivityVipView:update(_is_init)
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
-- 可领取
if flag==0 then --只有包月未赋值情况下才弄它
flag=3;
end
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
-- 已领取
if flag==0 then --只有包月未赋值情况下才弄它
flag=4;
end
self.btn_lingqu_month:setVisible(false);
self.yilingqu_month:setVisible(true);
end
else --显示续包月按钮
elseif flag==0 then --显示续包月按钮
self.btn_vip_lianxu:setVisible(true);
if #_nodes > 0 then
_nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
......@@ -208,7 +227,7 @@ function ActivityVipView:update(_is_init)
end--]]
-- 包年
local vipInfo2 = vipList[2];
local itemList2 = vipInfo2.itemList;
for i = 1, 3 do
local item = self:getChildByName("y_item_" .. i);
......@@ -229,6 +248,9 @@ function ActivityVipView:update(_is_init)
if data and data.val2 >= UserModel.time_second then
if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
-- 可领取
if flag==0 then --只有包月，续包月未赋值情况下才弄它
flag=3;
end
local day = math.floor((data.val2 - UserModel.time_second) /(24 * 3600)) + 1;
if data.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data.val1) then
day = day - 1;
......@@ -244,10 +266,13 @@ function ActivityVipView:update(_is_init)
_nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;
else
-- 已领取
if flag==0 then --只有包月，续包月未赋值情况下才弄它
flag=4;
end
self.btn_lingqu_year:setVisible(false);
self.yilingqu_year:setVisible(true);
end
else
elseif flag==0 then
self.btn_vip_year:setVisible(true);
if not _nodes[1] then
_nodes[1] = { };
......@@ -258,9 +283,40 @@ function ActivityVipView:update(_is_init)
if not _is_init and self.update_nodes_func then
self.update_nodes_func(_nodes);
end
--[[if flag==0 then
self.btn_vip_year:setVisible(true); --包年
self.btn_vip_month:setVisible(true); --包月
self.btn_vip_lianxu:setVisible(true); --续包月
else
self.btn_vip_year:setVisible(false); --包年
self.btn_vip_month:setVisible(false); --包月
self.btn_vip_lianxu:setVisible(false); --续包月
--table:remove(self.btn_vip_year);
--table:remove(self.btn_vip_month);
--table:remove(self.btn_vip_lianxu);
end--]]
return _nodes;
end
-- 删除table表中符合conditionFunc的数据
-- @param tb 要删除数据的table
-- @param conditionFunc 符合要删除的数据的条件函数
function removeTableData(tb, conditionFunc)
-- body
if tb ~= nil and next(tb) ~= nil then
-- todo
for i = #tb, 1, -1 do
if conditionFunc(tb[i]) then
-- todo
table.remove(tb, i)
end
end
end
end
function ActivityVipView:onGetClick(ref)
local reciever = require("app.views.view.XyxPayView_shdx"):show();
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
......@@ -13,13 +13,6 @@ function ActivityVipView:init()
local vipList = ShopInfo.getVipList();
-- （月卡，包年卡，包月卡）
self.btn_vip_year = self:getChildByName("btn_vip_year");
self.btn_vip_year.id = vipList[2].id;
self.btn_vip_year.fn = function()
self:onGetClick(self.btn_vip_year);
end
self.btn_vip_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetClick)) end);
self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
logD("vipList[3]--------------------->" .. #vipList);
if vipList[3] then
......@@ -37,27 +30,16 @@ function ActivityVipView:init()
end
self.btn_lingqu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
self.btn_lingqu_year = self:getChildByName("btn_lingqu_year");
self.btn_lingqu_year.id = vipList[2].id;
self.btn_lingqu_year.fn = function()
self:onLingquClick(self.btn_lingqu_year);
end
self.btn_lingqu_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
self.yilingqu_month = self:getChildByName("yilingqu_month");
self.yilingqu_month:setVisible(false);
self.yilingqu_year = self:getChildByName("yilingqu_year");
self.yilingqu_year:setVisible(false);
EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
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);
self.btn_vip_lianxu:setVisible(false);
local function authCallbackLua(result)
-- 去鉴权看看有没有订购连续包月
self.orderStaus = result;
......@@ -131,7 +113,7 @@ function ActivityVipView:update(_is_init)
end
local has_vip_month = false;
local data1 = UserModel.getVipByID(vipInfo1.id);
--[[local data1 = UserModel.getVipByID(vipInfo1.id); --没有包月
if data1 and data1.val2 >= UserModel.time_second then
has_vip_month = true;
elseif vipInfo3 then
......@@ -170,14 +152,14 @@ function ActivityVipView:update(_is_init)
-- self.btn_vip_month_single:setVisible(true);
-- _nodes[1] = { self.btn_vip_month_single };
end
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:setVisible(true);
self.btn_lingqu_month.id = vipInfo3.id;
-- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
_nodes[1] = { self.btn_lingqu_month };
......@@ -186,23 +168,23 @@ function ActivityVipView:update(_is_init)
self.btn_lingqu_month:setVisible(false);
self.yilingqu_month:setVisible(true);
end
elseif not has_vip_month then
--[[self.btn_vip_lianxu:setVisible(true);
else
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
end
if #_nodes > 0 then
--[[if #_nodes > 0 then
_nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
else
_nodes[1] = { self.btn_vip_lianxu };
end
end--]]
-- 包年
-- 包年,没有包年
local vipInfo2 = vipList[2];
local itemList2 = vipInfo2.itemList;
--[[for i = 1, 3 do
......@@ -220,7 +202,7 @@ function ActivityVipView:update(_is_init)
item:setVisible(false);
end
end--]]
local data = UserModel.getVipByID(vipInfo2.id);
--[[local data = UserModel.getVipByID(vipInfo2.id);
if data and data.val2 >= UserModel.time_second then
if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
-- 可领取
......@@ -231,23 +213,23 @@ function ActivityVipView:update(_is_init)
if day < 0 then
day = 0;
end
--[[self.btn_lingqu_year:setVisible(true);
self.btn_lingqu_year:setVisible(true);
self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)");
if not _nodes[1] then
_nodes[1] = { };
end
_nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;--]]
_nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;
else
-- 已领取
--self.yilingqu_year:setVisible(true);
end
else
--[[self.btn_vip_year:setVisible(true);
self.btn_vip_year:setVisible(true);
if not _nodes[1] then
_nodes[1] = { };
end
_nodes[1][#_nodes[1] + 1] = self.btn_vip_year;--]]
end
_nodes[1][#_nodes[1] + 1] = self.btn_vip_year;
end--]]
if not _is_init and self.update_nodes_func then
self.update_nodes_func(_nodes);
......
......@@ -228,8 +228,13 @@ function RoleBussinessView:onWxClick(ref)
end
function RoleBussinessView:onVipClick(ref)
if CHANNEL=="shdx" then
local reciever = require("app.views.view.XyxPayView_shdx"):show();
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
else
local reciever = require("app.views.view.ActivityView"):show("ActivityVipView");
cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
end
end
function RoleBussinessView:onGetClick(ref)
......
......@@ -3,8 +3,8 @@ cc.FileUtils:getInstance():setPopupNotify(false)
cc.FileUtils:getInstance():addSearchPath("src/")
cc.FileUtils:getInstance():addSearchPath("res/")
local engine_loaded = {};
for i,v in pairs(package.loaded) do
local engine_loaded = { };
for i, v in pairs(package.loaded) do
engine_loaded[i] = v;
end
......@@ -27,8 +27,10 @@ local function main()
PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
MEMBER_TYPE=0; --会员类型，0:不是会员, 其他对应pay.xml中的pay_id
IS_MEMBER=0; --是不是会员 0：不是会员
MEMBER_TYPE = 0;
-- 会员类型，0:不是会员, 其他对应pay.xml中的pay_id
IS_MEMBER = 0;
-- 是不是会员 0：不是会员
require "core.log.init";
require "core.net.socket_connection";
......@@ -40,31 +42,32 @@ local function main()
CDN_CONFIG_URL = ConfigInfo.getConfigInfo("cdn_config_url") or "";
if not CDN_CONFIG_URL or CDN_CONFIG_URL == "" then
GAME_LOGIN_URL = ConfigInfo.getConfigInfo("game_login_url");
print("本地配置 登录服务器地址："..GAME_LOGIN_URL);
print("本地配置 登录服务器地址：" .. GAME_LOGIN_URL);
PLATFORM = tonumber(ConfigInfo.getConfigInfo("platform"));
print("本地配置 平台号PLATFORM:"..PLATFORM);
print("本地配置 平台号PLATFORM:" .. PLATFORM);
end
if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
self:isMember();
end
cc.Director:getInstance():setAnimationInterval(1/30);
cc.Director:getInstance():setAnimationInterval(1 / 30);
require("app.MyApp"):create():run("LoadingScene");
end
--判断是不是会员
-- 判断是不是会员
function isMember()
local targetPlatform = cc.Application:getInstance():getTargetPlatform();
local function callbackLua(params)
logUI("IS MEMEBER---->"..params);
if params=="success" then
IS_MEMBER=1;
logUI("IS MEMEBER---->" .. params);
if params == "success" then
IS_MEMBER = 1;
else
IS_MEMBER=0;
IS_MEMBER = 0;
end
end
local luaj = require "cocos.cocos2d.luaj"; --引入luaj
local luaj = require "cocos.cocos2d.luaj";
-- 引入luaj
local className = "org/cocos2dx/lua/AppActivity";
local args = { callbackLua };
local sigs = "(I)V";
......@@ -82,15 +85,15 @@ function isMember()
end
function reloadGame()
for k,_ in pairs(package.loaded) do
for k, _ in pairs(package.loaded) do
local has_k = false;
for i,v in pairs(engine_loaded) do
for i, v in pairs(engine_loaded) do
if k == i then
has_k = true;
end
end
if not has_k then
print("remove:"..k);
print("remove:" .. k);
package.loaded[k] = nil;
end
end
......@@ -103,22 +106,22 @@ end
function loadGame(game_name)
local searchPaths = cc.FileUtils:getInstance():getSearchPaths();
local resPath = cc.FileUtils:getInstance():getWritablePath().."GameUpdate/"..game_name.."/";
searchPaths = {};
table.insert(searchPaths,1,resPath);
table.insert(searchPaths,2,resPath .. 'res/');
table.insert(searchPaths,3,resPath .. 'src/');
local resPath = cc.FileUtils:getInstance():getWritablePath() .. "GameUpdate/" .. game_name .. "/";
searchPaths = { };
table.insert(searchPaths, 1, resPath);
table.insert(searchPaths, 2, resPath .. 'res/');
table.insert(searchPaths, 3, resPath .. 'src/');
cc.FileUtils:getInstance():setSearchPaths(searchPaths);
for k,_ in pairs(package.loaded) do
for k, _ in pairs(package.loaded) do
local has_k = false;
for i,v in pairs(engine_loaded) do
for i, v in pairs(engine_loaded) do
if k == i then
has_k = true;
end
end
if not has_k then
print("remove:"..k);
print("remove:" .. k);
package.loaded[k] = nil;
end
end
......@@ -126,7 +129,7 @@ function loadGame(game_name)
cc.FileUtils:getInstance():purgeCachedEntries();
cc.Director:getInstance():purgeCachedData();
app:enterScene("LoadingScene",{nextSceneName="main"});
app:enterScene("LoadingScene", { nextSceneName = "main" });
end
local status, msg = xpcall(main, __G__TRACKBACK__)
......
......@@ -16,13 +16,13 @@
<PreSize X="1.3815" Y="1.1945" />
<FileData Type="Normal" Path="common/bg_huodong.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="bg_title" ActionTag="255349692" Tag="2177" IconVisible="False" LeftMargin="34.6646" RightMargin="166.3354" TopMargin="-68.0567" BottomMargin="530.0567" LeftEage="200" RightEage="200" TopEage="29" BottomEage="29" Scale9OriginX="200" Scale9OriginY="29" Scale9Width="209" Scale9Height="30" ctype="ImageViewObjectData">
<AbstractNodeData Name="bg_title" ActionTag="255349692" Tag="2177" IconVisible="False" LeftMargin="34.6649" RightMargin="166.3351" TopMargin="-54.0571" BottomMargin="516.0571" LeftEage="200" RightEage="200" TopEage="29" BottomEage="29" Scale9OriginX="200" Scale9OriginY="29" Scale9Width="209" Scale9Height="30" ctype="ImageViewObjectData">
<Size X="609.0000" Y="88.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="339.1646" Y="574.0567" />
<Position X="339.1649" Y="560.0571" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4187" Y="1.0437" />
<PrePosition X="0.4187" Y="1.0183" />
<PreSize X="0.7519" Y="0.1600" />
<FileData Type="Normal" Path="common/bg_app_title02.png" Plist="" />
</AbstractNodeData>
......@@ -36,7 +36,7 @@
<PreSize X="0.1235" Y="0.0764" />
<FileData Type="Normal" Path="common/title_activity.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="bg_activity_vip" ActionTag="-750140484" Tag="332" IconVisible="False" LeftMargin="-120.0042" RightMargin="-63.9957" TopMargin="28.9576" BottomMargin="-40.9576" ctype="SpriteObjectData">
<AbstractNodeData Name="bg_activity_vip" ActionTag="-750140484" Tag="332" IconVisible="False" LeftMargin="-120.0042" RightMargin="-63.9958" TopMargin="28.9576" BottomMargin="-40.9576" ctype="SpriteObjectData">
<Size X="994.0000" Y="562.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="376.9958" Y="240.0424" />
......@@ -77,7 +77,7 @@
<PreSize X="0.8012" Y="0.3527" />
<FileData Type="Normal" Path="ui/Activity/tianjin_cucc/title_activity.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2777" RightMargin="336.7223" TopMargin="500.3858" BottomMargin="-10.3858" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2830" RightMargin="336.7170" TopMargin="500.3858" BottomMargin="-10.3858" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-1.1016" RightMargin="1.1016" TopMargin="0.0180" BottomMargin="-0.0180" ctype="SpriteObjectData">
......@@ -103,9 +103,19 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="icon_renew" ActionTag="-126285829" Tag="45" IconVisible="False" LeftMargin="100.0386" RightMargin="-5.0386" TopMargin="-9.3816" BottomMargin="45.3816" LeftEage="22" RightEage="22" TopEage="7" BottomEage="7" Scale9OriginX="22" Scale9OriginY="7" Scale9Width="23" Scale9Height="10" ctype="ImageViewObjectData">
<Size X="67.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="133.5386" Y="57.3816" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.8243" Y="0.9564" />
<PreSize X="0.4136" Y="0.4000" />
<FileData Type="Normal" Path="ui/Activity/activity_renew.png" Plist="" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="392.2777" Y="19.6142" />
<Position X="392.2830" Y="19.6142" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4843" Y="0.0357" />
......@@ -117,17 +127,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="icon_renew" ActionTag="-126285829" Tag="45" IconVisible="False" LeftMargin="413.8210" RightMargin="329.1790" TopMargin="493.4732" BottomMargin="32.5268" LeftEage="22" RightEage="22" TopEage="7" BottomEage="7" Scale9OriginX="22" Scale9OriginY="7" Scale9Width="23" Scale9Height="10" ctype="ImageViewObjectData">
<Size X="67.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="447.3210" Y="44.5268" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5522" Y="0.0810" />
<PreSize X="0.0827" Y="0.0436" />
<FileData Type="Normal" Path="ui/Activity/activity_renew.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="57.2852" RightMargin="590.7148" TopMargin="495.1287" BottomMargin="-5.1287" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="310.1406" RightMargin="337.8594" TopMargin="500.3862" BottomMargin="-10.3862" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
......@@ -165,122 +165,10 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="138.2852" Y="24.8713" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1707" Y="0.0452" />
<PreSize X="0.2000" Y="0.1091" />
<TextColor A="255" R="65" G="65" B="70" />
<DisabledFileData Type="Default" Path="Default/Button_Disable.png" Plist="" />
<PressedFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<NormalFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="yilingqu_month" Visible="False" ActionTag="-1665006638" Tag="245" IconVisible="False" LeftMargin="81.3665" RightMargin="612.6335" TopMargin="487.3489" BottomMargin="-11.3489" ctype="SpriteObjectData">
<Size X="116.0000" Y="74.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="139.3665" Y="25.6511" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.1721" Y="0.0466" />
<PreSize X="0.1432" Y="0.1345" />
<FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="btn_vip_year" ActionTag="1349290642" VisibleForFrame="False" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="539.6220" RightMargin="108.3780" TopMargin="494.3176" BottomMargin="-4.3176" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-226.4436" RightMargin="226.4436" TopMargin="-3.2460" BottomMargin="3.2460" ctype="SpriteObjectData">
<Size X="162.0000" Y="60.0000" />
<AnchorPoint ScaleX="0.4999" ScaleY="0.5779" />
<Position X="-145.4592" Y="37.9222" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="-0.8979" Y="0.6320" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="Text_102" ActionTag="-1496397639" Tag="983" IconVisible="False" LeftMargin="20.6549" RightMargin="21.3451" TopMargin="13.6017" BottomMargin="15.3983" FontSize="26" LabelText="198元包年" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="120.0000" Y="31.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="80.6549" Y="30.8983" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="165" G="42" B="42" />
<PrePosition X="0.4979" Y="0.5150" />
<PreSize X="0.7407" Y="0.5167" />
<FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="Text_103" Visible="False" ActionTag="900644303" VisibleForFrame="False" Tag="984" IconVisible="False" LeftMargin="17.7905" RightMargin="14.2095" TopMargin="31.6245" BottomMargin="8.3755" FontSize="20" LabelText="（剩余300天）" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="130.0000" Y="20.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="82.7905" Y="18.3755" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="165" G="42" B="42" />
<PrePosition X="0.5111" Y="0.3063" />
<PreSize X="0.8025" Y="0.3333" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="620.6220" Y="25.6824" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7662" Y="0.0467" />
<PreSize X="0.2000" Y="0.1091" />
<TextColor A="255" R="65" G="65" B="70" />
<DisabledFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<PressedFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<NormalFileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="btn_lingqu_year" Visible="False" ActionTag="408602144" Tag="243" IconVisible="False" LeftMargin="536.9364" RightMargin="111.0636" TopMargin="495.3234" BottomMargin="-5.3234" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
<Size X="162.0000" Y="60.0000" />
<Children>
<AbstractNodeData Name="selected" Visible="False" ActionTag="1452305529" Tag="202" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
<Size X="162.0000" Y="60.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="81.0000" Y="30.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" Y="0.5000" />
<PreSize X="1.0000" Y="1.0000" />
<FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="Image_2" ActionTag="-1065554251" Tag="44" IconVisible="False" LeftMargin="6.2166" RightMargin="89.7834" TopMargin="2.0000" BottomMargin="4.0000" LeftEage="21" RightEage="21" TopEage="17" BottomEage="17" Scale9OriginX="21" Scale9OriginY="17" Scale9Width="24" Scale9Height="20" ctype="ImageViewObjectData">
<Size X="66.0000" Y="54.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="39.2166" Y="31.0000" />
<Scale ScaleX="0.6667" ScaleY="0.6667" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.2421" Y="0.5167" />
<PreSize X="0.4074" Y="0.9000" />
<FileData Type="Normal" Path="ui/Activity/activity_gift_icon.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="txt" ActionTag="1626546622" Tag="244" IconVisible="False" LeftMargin="70.2168" RightMargin="8.7832" TopMargin="16.7121" BottomMargin="19.2879" FontSize="20" LabelText="领取礼包" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
<Size X="83.0000" Y="24.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="111.7168" Y="31.2879" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="190" G="86" B="10" />
<PrePosition X="0.6896" Y="0.5215" />
<PreSize X="0.5123" Y="0.4000" />
<FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="617.9364" Y="24.6766" />
<Position X="391.1406" Y="19.6138" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7629" Y="0.0449" />
<PrePosition X="0.4829" Y="0.0357" />
<PreSize X="0.2000" Y="0.1091" />
<TextColor A="255" R="65" G="65" B="70" />
<DisabledFileData Type="Default" Path="Default/Button_Disable.png" Plist="" />
......@@ -289,13 +177,13 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="yilingqu_year" Visible="False" ActionTag="-1866334125" Tag="246" IconVisible="False" LeftMargin="559.6356" RightMargin="134.3644" TopMargin="487.5239" BottomMargin="-11.5239" ctype="SpriteObjectData">
<AbstractNodeData Name="yilingqu_month" Visible="False" ActionTag="-1665006638" Tag="245" IconVisible="False" LeftMargin="330.8696" RightMargin="363.1304" TopMargin="490.2706" BottomMargin="-14.2706" ctype="SpriteObjectData">
<Size X="116.0000" Y="74.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="617.6356" Y="25.4761" />
<Position X="388.8696" Y="22.7294" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7625" Y="0.0463" />
<PrePosition X="0.4801" Y="0.0413" />
<PreSize X="0.1432" Y="0.1345" />
<FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
......
......@@ -34,10 +34,9 @@
<FilePathData Path="ui/dress/BusinessView.csd" />
<FilePathData Path="ui/dress/DressLayer.csd" />
<FilePathData Path="ui/achievement/AchievementItem.csd" />
<FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
<FilePathData Path="ui/Activity/shanghai_ctcc/ActivityVip.csd" />
<FilePathData Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
<ActiveDocument Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
</Value>
</Item>
</Properties>
......