Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 19110c18 19110c18bd3b72c300316fb5a6af7686220b77c5 by jinwawa
Options

0622

1 parent 497334e3
Expand all
Inline Side-by-side
Showing 69 changed files with 186 additions and 95 deletions
......@@ -3,7 +3,7 @@
<!--m0800279afc6c-->
<!--m0800278b87c2-->
<!---->
<Account>m0800279afc6c</Account>
<Account>m0800279afc6e</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>1030100010142873</uid>
<uid>1030100010142906</uid>
<is_bird_game_guide>1</is_bird_game_guide>
<bird_best>1008</bird_best>
<is_haidao_game_guide>1</is_haidao_game_guide>
......

6.65 KB | W: | H:

95.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

896 Bytes | W: | H:

2.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.01 KB | W: | H:

4.73 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.68 KB | W: | H:

4.28 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

21.3 KB | W: | H:

18.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

23.9 KB | W: | H:

18.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

19.6 KB | W: | H:

13.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

23.1 KB | W: | H:

14.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

482 KB | W: | H:

37 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

19.3 KB | W: | H:

13.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

22.1 KB | W: | H:

13.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

18 KB | W: | H:

2.98 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

22.6 KB | W: | H:

3.01 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -274,21 +274,24 @@ end
-- 上海电信支付
function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
--logD("支付类型---------------------------->"..MEMBER_TYPE);
local pay_params = "";
--local payInfo = ShopInfo.getPayInfoByProduct(productId);
local function callbackLua(params)
if params == "success" then
local arr = StringUtil.split(params,",");
--logUI("支付返回的信息："..arr[1].."-----------orderId:"..arr[2].."-------------orderSn:"..arr[3]);
if arr[1] and arr[1] == "success" then
if callBack then
callBack(params);
end
Alert.showOne(strings.msg_3001);
elseif params == "cancel" then
elseif arr[1] and arr[1] == "cancel" then
Alert.showOne(strings.msg_3003);
else
Alert.showOne(strings.msg_3002);
end
logUI(params);
--logUI(params);
end
local function payCallbackFromJava(params)
......
......@@ -411,10 +411,11 @@ end
function UserModel.onConnectSuccess(params)
logUI("on connect success");
--APK容易崩溃，查找原因中。。。
--[[local targetPlatform = cc.Application:getInstance():getTargetPlatform();
if CHANNEL == "shdx" and targetPlatform ~= cc.PLATFORM_OS_WINDOWS and targetPlatform ~= cc.PLATFORM_OS_MAC then
--已解决，Android中加上了runOnUIThread导致的
local targetPlatform = cc.Application:getInstance():getTargetPlatform();
if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
local function callbackLua(params)
--logUI("on connect success callbackLua");
logUI("on connect success callbackLua");
SocketClient:getInstance():send("gateway_msg.login_msg",
{
platform = PLATFORM,
......@@ -424,28 +425,28 @@ function UserModel.onConnectSuccess(params)
} );
logUI("从服务端返回会员类型：" .. params);
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"
local sigs = "(I)V";
-- 传入string参数，无返回值
-- luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
-- luaj.callStaticMethod() 会返回两个值
-- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
-- 当失败时，第一个值为 false，第二个值是错误代码
local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs)
local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
if not ok then
print("sendPayInfo error:" .. ret)
print("sendPayInfo error:" .. ret);
end
else--]]
else
SocketClient:getInstance():send("gateway_msg.login_msg",
{
platform = PLATFORM,
account = account,
session = session,
} );
--end
end
end
function UserModel.onConnectFaild(params)
......
......@@ -18,6 +18,13 @@ function ActivityMatchView:init()
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());
self:getChildByName("bg_match_3"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/tiger_shdx.png"):getSpriteFrame());
end
self.rankView = self:getChildByName("rankView");
self.btn_start_game = self:getChildByName("btn_start_game");
......
......@@ -21,25 +21,25 @@ function ActivityVipView:init()
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");
self.btn_vip_month = self:getChildByName("btn_vip_month");
logD("vipList[1]--------------------->" .. #vipList);
if vipList[1] then
self.btn_vip_lianxu.id = vipList[1].id;
self.btn_vip_lianxu.fn = function()
self:onGetContinueClick(self.btn_vip_lianxu);
self.btn_vip_month.id = vipList[1].id;
self.btn_vip_month.fn = function()
self:onGetContinueClick(self.btn_vip_month);
end
self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
self.btn_vip_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
end
-- 续包月
self.btn_vip_lianxu_month = self:getChildByName("btn_vip_lianxu_month");
self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
logD("vipList[3]--------------------->" .. #vipList);
if vipList[3] then
self.btn_vip_lianxu_month.id = vipList[3].id;
self.btn_vip_lianxu_month.fn = function()
self:onGetContinueClick(self.btn_vip_lianxu_month);
self.btn_vip_lianxu.id = vipList[3].id;
self.btn_vip_lianxu.fn = function()
self:onGetContinueClick(self.btn_vip_lianxu);
end
self.btn_vip_lianxu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
end
self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
......@@ -63,32 +63,15 @@ function ActivityVipView:init()
EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
UmengHelper.onEvent("activity_vip_show");
--UmengHelper.onEvent("activity_vip_show");
self.yilingqu_month:setVisible(false);
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_month:setVisible(false); --待领取
self.btn_lingqu_year:setVisible(false);
local function authCallbackLua(result)
-- 去鉴权看看有没有订购连续包月
self.orderStaus = result;
if self.orderStaus == "success" then
-- 已经订购过
self.btn_lingqu_month:setVisible(true);
-- 订购过先将可领取按钮弄出来
elseif self.orderStaus == "" then
-- 鉴权失败
else
-- 没有订购过，鉴权返回订购产品id
end
-- return self:update(true); --处理好订购关系后在更新后续内容
end
local vipList = ShopInfo.getVipList();
DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua);
self.btn_vip_year:setVisible(false); --包年
self.btn_vip_month:setVisible(false); --包月
self.btn_vip_lianxu:setVisible(false); --续包月
return self:update(true);
end
......@@ -155,7 +138,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
if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then--单包月礼包详情
-- 可领取
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
......@@ -167,29 +150,31 @@ function ActivityVipView:update(_is_init)
self.btn_lingqu_month:setVisible(true);
self.btn_lingqu_month.id = vipInfo1.id;
-- self.btn_lingqu_month:getChildByName("txt"):setString("(剩余" .. day .. "天)");
_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
else
self.btn_vip_month:setVisible(true); --显示包月按钮
_nodes[1] = { self.btn_vip_month };
--[[elseif not has_vip_month then --这里需要改
if vipInfo3 then
-- self.btn_vip_month:setVisible(true);
-- _nodes[1] = { self.btn_vip_month };
self.btn_vip_month:setVisible(true);
_nodes[1] = { self.btn_vip_month };
else
-- self.btn_vip_month_single:setVisible(true);
-- _nodes[1] = { self.btn_vip_month_single };
end
self.btn_vip_month:setVisible(true);
_nodes[1] = { self.btn_vip_month };
end--]]
end
if vipInfo3 then
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 };
......@@ -198,7 +183,14 @@ function ActivityVipView:update(_is_init)
self.btn_lingqu_month:setVisible(false);
self.yilingqu_month:setVisible(true);
end
elseif not has_vip_month then
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
--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;
......@@ -208,12 +200,12 @@ function ActivityVipView:update(_is_init)
end
end
if #_nodes > 0 then
_nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu_month;
--[[if #_nodes > 0 then
_nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
_nodes[1][#_nodes[1] + 1] = self.btn_vip_month;
else
_nodes[1] = { self.btn_vip_lianxu_month, self.btn_vip_lianxu };
end
_nodes[1] = { self.btn_vip_lianxu, self.btn_vip_month };
end--]]
-- 包年
local vipInfo2 = vipList[2];
......@@ -233,7 +225,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
-- 可领取
......@@ -244,15 +236,16 @@ function ActivityVipView:update(_is_init)
if day < 0 then
day = 0;
end
--[[self.btn_lingqu_year:setVisible(true);
self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)");
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);
self.btn_lingqu_year:setVisible(false);
self.yilingqu_year:setVisible(true);
end
else
self.btn_vip_year:setVisible(true);
......
......@@ -105,20 +105,23 @@ function XyxPayView:onTouchEnd(event)
local p = self.layer:convertToWorldSpace(event:getLocation());
end
--单包月
function XyxPayView:onMonthVipClick(ref, event)
local vipList = ShopInfo.getVipList();
MEMBER_TYPE=vipList[1].id;
local shopInfo = ShopInfo.getPayInfo(vipList[1].id);
ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num, handler(self, self.onPayCallBack));
ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100 , handler(self, self.onPayCallBack));
end
--单包年
function XyxPayView:onYearVipClick(ref, event)
local vipList = ShopInfo.getVipList();
MEMBER_TYPE=vipList[2].id;
local shopInfo = ShopInfo.getPayInfo(vipList[2].id);
ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[2].num, handler(self, self.onPayCallBack));
ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100, handler(self, self.onPayCallBack));
end
--续包月
function XyxPayView:onBuyClick(ref, event)
local vipList = ShopInfo.getVipList();
MEMBER_TYPE=vipList[3].id;
......@@ -126,16 +129,18 @@ function XyxPayView:onBuyClick(ref, event)
-- 包月卡的id，获取包月卡的item信息
-- 天津联通支付，支持连续包月
--logUI("ActivityVipView:onGetContinueClick------------------>");
ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[3].num);
ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100, handler(self, self.onPayCallBack));
end
function XyxPayView:onPayCallBack(params)
local arr = StringUtil.split(params,",");
logUI("支付返回的信息："..arr[1].."-----------:"..arr[2]);
if arr[1] and arr[1] == "success" then
if arr[1] and arr[1] == "success" and arr[2] and arr[3] then --支付成功
logUI("支付返回的信息："..arr[1].."订单号:"..arr[2].." 流水号:"..arr[3]);
SocketClient:getInstance():send("gateway_msg.shanghai_dianxin_pay_msg",
{
shanghai_dianxin_pay_id = MEMBER_TYPE,
order_number=arr[2],
order_number=arr[3],
} );
if not TableUtil.IsInTable(UserModel.free_game_id, self.game_id) then
......@@ -143,7 +148,6 @@ function XyxPayView:onPayCallBack(params)
end
LoadingManager.showDataLoading();
self:runAction(cc.Sequence:create(cc.DelayTime:create(1), cc.CallFunc:create( function()
self:close();
LoadingManager.removeDataLoading();
......@@ -152,7 +156,7 @@ function XyxPayView:onPayCallBack(params)
end
end )));
end
logUI("小游戏支付返回：" .. params);
--logUI("小游戏支付返回：" .. params);
end
function XyxPayView:onClose()
......@@ -183,7 +187,7 @@ end
-- 左键处理函数
function XyxPayView:onKeypadLeft()
XyxPayView.super.onKeypadLeft(self, false, true, false, true, false);
XyxPayView.super.onKeypadLeft(self, true, true, true, true, true);
end
-- 右键处理函数
......@@ -193,7 +197,7 @@ end
function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight)
-- logD("near_node--------------------->"..near_node.tag);
for i, v in ipairs(self.nodes) do
--[[for i, v in ipairs(self.nodes) do
for index, node in ipairs(v) do
node:setScale(0.50);
end
......@@ -202,6 +206,12 @@ function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight)
if near_node:getName() == "btn_buy" or near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then
near_node:setScale(0.65);
-- 选中放大
end--]]
if near_node:getName()=="btn_buy" then --续包月
self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt2.png"):getSpriteFrame());
elseif near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then --包月
self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt.png"):getSpriteFrame());
end
XyxPayView.super.updateSelectedState(self, near_node, isBounce, is_show_highlight);
......
......@@ -27,7 +27,8 @@ 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
MEMBER_TYPE=0; --会员类型，0:不是会员, 其他对应pay.xml中的pay_id
IS_MEMBER=0; --是不是会员 0：不是会员
require "core.log.init";
require "core.net.socket_connection";
......@@ -44,10 +45,42 @@ local function main()
print("本地配置 平台号PLATFORM:"..PLATFORM);
end
if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
self:isMember();
end
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;
else
IS_MEMBER=0;
end
end
local luaj = require "cocos.cocos2d.luaj"; --引入luaj
local className = "org/cocos2dx/lua/AppActivity";
local args = { callbackLua };
local sigs = "(I)V";
-- 传入string参数，无返回值
-- luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
-- luaj.callStaticMethod() 会返回两个值
-- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
-- 当失败时，第一个值为 false，第二个值是错误代码
local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
if not ok then
print("authPermission error:" .. ret);
end
end
function reloadGame()
for k,_ in pairs(package.loaded) do
local has_k = false;
......

6.65 KB | W: | H:

95.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -55,7 +55,7 @@
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.2006" Y="0.3436" />
<PreSize X="0.5889" Y="0.9491" />
<FileData Type="Normal" Path="ui/Activity/bg_gift_one_month.png" Plist="" />
<FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_month.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="Image_57" ActionTag="-734408069" Tag="982" IconVisible="False" LeftMargin="409.0528" RightMargin="-17.0528" TopMargin="97.3033" BottomMargin="-69.3033" LeftEage="137" RightEage="137" TopEage="172" BottomEage="172" Scale9OriginX="137" Scale9OriginY="172" Scale9Width="144" Scale9Height="178" ctype="ImageViewObjectData">
<Size X="418.0000" Y="522.0000" />
......@@ -65,9 +65,9 @@
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7630" Y="0.3485" />
<PreSize X="0.5160" Y="0.9491" />
<FileData Type="Normal" Path="ui/Activity/bg_gift_one_year.png" Plist="" />
<FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_year.png" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="-21.9685" RightMargin="669.9685" TopMargin="496.6200" BottomMargin="-6.6200" 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="-21.9510" RightMargin="669.9510" TopMargin="496.6200" BottomMargin="-6.6200" 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" ctype="SpriteObjectData">
......@@ -105,7 +105,7 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="59.0315" Y="23.3800" />
<Position X="59.0490" Y="23.3800" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.0729" Y="0.0425" />
......@@ -117,7 +117,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="btn_vip_lianxu_month" ActionTag="-1637580883" Tag="206" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="182.6058" RightMargin="465.3942" TopMargin="496.8307" BottomMargin="-6.8307" 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_month" ActionTag="-1637580883" Tag="206" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="182.5740" RightMargin="465.4260" TopMargin="496.8307" BottomMargin="-6.8307" 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="2138735712" Tag="207" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
......@@ -145,7 +145,7 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="263.6058" Y="23.1693" />
<Position X="263.5740" Y="23.1693" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.3254" Y="0.0421" />
......@@ -157,7 +157,7 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="79.2850" RightMargin="568.7150" TopMargin="498.1288" BottomMargin="-8.1289" 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="79.2850" RightMargin="568.7150" TopMargin="498.1289" BottomMargin="-8.1289" 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">
......@@ -218,7 +218,7 @@
<FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="btn_vip_year" ActionTag="1349290642" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="561.6255" RightMargin="86.3745" TopMargin="497.3177" BottomMargin="-7.3177" 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_year" ActionTag="1349290642" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="561.6540" RightMargin="86.3460" TopMargin="497.3177" BottomMargin="-7.3177" 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" ctype="SpriteObjectData">
......@@ -257,7 +257,7 @@
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="642.6255" Y="22.6823" />
<Position X="642.6540" Y="22.6823" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.7934" Y="0.0412" />
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file

896 Bytes | W: | H:

2.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.68 KB | W: | H:

4.28 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -3,7 +3,7 @@
<Item Key="GuidesList">
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="151.2523" />
<Guides Direction="Horizontal" Position="439.8254" />
</HorizontalList>
<VerticalList>
<Guides Position="640.6776" />
......
......@@ -780,6 +780,7 @@
<Image Name="bg_match_9_03.png" />
<Image Name="bg_match_9_04.png" />
<Image Name="bg_match_9_05.png" />
<Image Name="bg_match_9_shdx.png" />
<Image Name="bg_match_background.png" />
<Image Name="bg_match_check_001.png" />
<Image Name="bg_match_check_01.png" />
......@@ -815,6 +816,7 @@
<Image Name="match_10_caomei.png" />
<Image Name="match_10_ci.png" />
<Image Name="match_10_girl.png" />
<Image Name="match_10_girl_shdx.png" />
<Image Name="match_10_juzi.png" />
<Image Name="match_10_logo.png" />
<Image Name="match_10_tang.png" />
......@@ -827,9 +829,16 @@
<Project Name="MatchRewardLayer.csd" Type="Layer" />
<Image Name="rabbit.png" />
<Image Name="rabbit_logo.png" />
<Image Name="rabbit_shdx.png" />
<Image Name="tiger.png" />
<Image Name="tiger_shdx.png" />
<Image Name="who_am_i.png" />
</Folder>
<Folder Name="shanghai_ctcc">
<Project Name="ActivityVip.csd" Type="Layer" />
<Image Name="bg_gift_month.png" />
<Image Name="bg_gift_year.png" />
</Folder>
<Folder Name="tianjin_cucc">
<Project Name="ActivityVip.csd" Type="Layer" />
<Image Name="bg_activity.png" />
......@@ -964,9 +973,6 @@
<Image Name="turntable_show_time.png" />
<Image Name="vip_title.png" />
<Image Name="yilingqu.png" />
<Folder Name="shanghai_ctcc">
<Project Name="ActivityVip.csd" Type="Layer" />
</Folder>
</Folder>
<Folder Name="chenghao">
<Image Name="bg_chenghao_get.png" />
......@@ -1467,10 +1473,13 @@
<Image Name="bg_middle.png" />
<Image Name="bg_middle_select.png" />
<Image Name="bg_pay.png" />
<Image Name="bg_pic.png" />
<Image Name="bg_right.png" />
<Image Name="bg_right_select.png" />
<Image Name="btn_back.png" />
<Image Name="btn_back_select.png" />
<Image Name="txt.png" />
<Image Name="txt2.png" />
<Project Name="XyxPayLayer.csd" Type="Layer" />
</Folder>
<Folder Name="tianjin_cucc">
......
......@@ -28,5 +28,17 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<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" />
</OpenedDocuments>
<ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
......@@ -214,7 +214,7 @@ enum E_STATISTICS_TYPE
E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID)
E_STATISTICS_TYPE_15 = 15;//上海电信付费
E_STATISTICS_TYPE_15 = 15;//上海电信付费(pay_id,order_number,serial_number)
......
......@@ -189,6 +189,8 @@ message get_pay_day_reward_msg_res
message shanghai_dianxin_pay_msg//1,0x00353#上海电信支付成功
{
optional uint32 shanghai_dianxin_pay_id = 1;//上海电信会员支付ID(0:不是会员, 其他对应pay.xml中的pay_id)
optional string order_number = 2;//订单号
optional string serial_number = 3;//流水号
}
message shanghai_dianxin_pay_msg_res
......
......@@ -43,6 +43,7 @@ enum E_PLATFORM
E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通
E_PLATFORM_XHX_DANG_BEI = 104;//当贝
E_PLATFORM_XHX_DA_TANG = 105;//大唐
E_PLATFORM_XHX_SICHUAN_YIDONG = 107;//四川移动
......
......@@ -12,6 +12,13 @@ message save_msg//1,0x60001#保存统计数据
repeated uint32 expand_param = 4;//扩展参数
}
message save_string_msg//1,0x60002#保存统计数据
{
optional uint32 platform = 1;//平台ID
optional uint32 event_id = 3;//事件ID
repeated string expand_param = 4;//扩展参数
}
message load_rank_msg_res
{
}
\ No newline at end of file
......