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 189 additions and 98 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800279afc6c</Account> 6 <Account>m0800279afc6e</Account>
7 <exp>0</exp> 7 <exp>0</exp>
8 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
9 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
29 <uid>1030100010142873</uid> 29 <uid>1030100010142906</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <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 ...@@ -274,21 +274,24 @@ end
274 274
275 -- 上海电信支付 275 -- 上海电信支付
276 function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid) 276 function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
277 --logD("支付类型---------------------------->"..MEMBER_TYPE);
277 local pay_params = ""; 278 local pay_params = "";
278 --local payInfo = ShopInfo.getPayInfoByProduct(productId); 279 --local payInfo = ShopInfo.getPayInfoByProduct(productId);
279 280
280 local function callbackLua(params) 281 local function callbackLua(params)
281 if params == "success" then 282 local arr = StringUtil.split(params,",");
283 --logUI("支付返回的信息："..arr[1].."-----------orderId:"..arr[2].."-------------orderSn:"..arr[3]);
284 if arr[1] and arr[1] == "success" then
282 if callBack then 285 if callBack then
283 callBack(params); 286 callBack(params);
284 end 287 end
285 Alert.showOne(strings.msg_3001); 288 Alert.showOne(strings.msg_3001);
286 elseif params == "cancel" then 289 elseif arr[1] and arr[1] == "cancel" then
287 Alert.showOne(strings.msg_3003); 290 Alert.showOne(strings.msg_3003);
288 else 291 else
289 Alert.showOne(strings.msg_3002); 292 Alert.showOne(strings.msg_3002);
290 end 293 end
291 logUI(params); 294 --logUI(params);
292 end 295 end
293 296
294 local function payCallbackFromJava(params) 297 local function payCallbackFromJava(params)
......
...@@ -411,10 +411,11 @@ end ...@@ -411,10 +411,11 @@ end
411 function UserModel.onConnectSuccess(params) 411 function UserModel.onConnectSuccess(params)
412 logUI("on connect success"); 412 logUI("on connect success");
413 --APK容易崩溃，查找原因中。。。 413 --APK容易崩溃，查找原因中。。。
414 --[[local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 414 --已解决，Android中加上了runOnUIThread导致的
415 if CHANNEL == "shdx" and targetPlatform ~= cc.PLATFORM_OS_WINDOWS and targetPlatform ~= cc.PLATFORM_OS_MAC then 415 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
416 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
416 local function callbackLua(params) 417 local function callbackLua(params)
417 --logUI("on connect success callbackLua"); 418 logUI("on connect success callbackLua");
418 SocketClient:getInstance():send("gateway_msg.login_msg", 419 SocketClient:getInstance():send("gateway_msg.login_msg",
419 { 420 {
420 platform = PLATFORM, 421 platform = PLATFORM,
...@@ -424,28 +425,28 @@ function UserModel.onConnectSuccess(params) ...@@ -424,28 +425,28 @@ function UserModel.onConnectSuccess(params)
424 } ); 425 } );
425 logUI("从服务端返回会员类型：" .. params); 426 logUI("从服务端返回会员类型：" .. params);
426 end 427 end
427 local luaj = require "cocos.cocos2d.luaj" --引入luaj 428 local luaj = require "cocos.cocos2d.luaj"; --引入luaj
428 local className = "org/cocos2dx/lua/AppActivity"; 429 local className = "org/cocos2dx/lua/AppActivity";
429 local args = { callbackLua }; 430 local args = { callbackLua };
430 local sigs = "(I)V" 431 local sigs = "(I)V";
431 -- 传入string参数，无返回值 432 -- 传入string参数，无返回值
432 433
433 -- luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。 434 -- luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
434 -- luaj.callStaticMethod() 会返回两个值 435 -- luaj.callStaticMethod() 会返回两个值
435 -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有） 436 -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
436 -- 当失败时，第一个值为 false，第二个值是错误代码 437 -- 当失败时，第一个值为 false，第二个值是错误代码
437 local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs) 438 local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
438 if not ok then 439 if not ok then
439 print("sendPayInfo error:" .. ret) 440 print("sendPayInfo error:" .. ret);
440 end 441 end
441 else--]] 442 else
442 SocketClient:getInstance():send("gateway_msg.login_msg", 443 SocketClient:getInstance():send("gateway_msg.login_msg",
443 { 444 {
444 platform = PLATFORM, 445 platform = PLATFORM,
445 account = account, 446 account = account,
446 session = session, 447 session = session,
447 } ); 448 } );
448 --end 449 end
449 end 450 end
450 451
451 function UserModel.onConnectFaild(params) 452 function UserModel.onConnectFaild(params)
......
...@@ -18,6 +18,13 @@ function ActivityMatchView:init() ...@@ -18,6 +18,13 @@ function ActivityMatchView:init()
18 self:getChildByName("bg_match_7"):setVisible(false); --奔跑吧小兔子 18 self:getChildByName("bg_match_7"):setVisible(false); --奔跑吧小兔子
19 self:getChildByName("bg_match_3"):setVisible(false); --猜猜我是谁 19 self:getChildByName("bg_match_3"):setVisible(false); --猜猜我是谁
20 20
21 if CHANNEL=="shdx" then
22 self:getChildByName("bg_match_9"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_9_shdx.png"):getSpriteFrame());
23 self:getChildByName("bg_match_5"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/match_10_girl_shdx.png"):getSpriteFrame());
24 self:getChildByName("bg_match_7"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/rabbit_shdx.png"):getSpriteFrame());
25 self:getChildByName("bg_match_3"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/tiger_shdx.png"):getSpriteFrame());
26 end
27
21 self.rankView = self:getChildByName("rankView"); 28 self.rankView = self:getChildByName("rankView");
22 29
23 self.btn_start_game = self:getChildByName("btn_start_game"); 30 self.btn_start_game = self:getChildByName("btn_start_game");
......
...@@ -21,25 +21,25 @@ function ActivityVipView:init() ...@@ -21,25 +21,25 @@ function ActivityVipView:init()
21 self.btn_vip_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetClick)) end); 21 self.btn_vip_year:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetClick)) end);
22 22
23 -- 包月 23 -- 包月
24 self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu"); 24 self.btn_vip_month = self:getChildByName("btn_vip_month");
25 logD("vipList[1]--------------------->" .. #vipList); 25 logD("vipList[1]--------------------->" .. #vipList);
26 if vipList[1] then 26 if vipList[1] then
27 self.btn_vip_lianxu.id = vipList[1].id; 27 self.btn_vip_month.id = vipList[1].id;
28 self.btn_vip_lianxu.fn = function() 28 self.btn_vip_month.fn = function()
29 self:onGetContinueClick(self.btn_vip_lianxu); 29 self:onGetContinueClick(self.btn_vip_month);
30 end 30 end
31 self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end); 31 self.btn_vip_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
32 end 32 end
33 33
34 -- 续包月 34 -- 续包月
35 self.btn_vip_lianxu_month = self:getChildByName("btn_vip_lianxu_month"); 35 self.btn_vip_lianxu = self:getChildByName("btn_vip_lianxu");
36 logD("vipList[3]--------------------->" .. #vipList); 36 logD("vipList[3]--------------------->" .. #vipList);
37 if vipList[3] then 37 if vipList[3] then
38 self.btn_vip_lianxu_month.id = vipList[3].id; 38 self.btn_vip_lianxu.id = vipList[3].id;
39 self.btn_vip_lianxu_month.fn = function() 39 self.btn_vip_lianxu.fn = function()
40 self:onGetContinueClick(self.btn_vip_lianxu_month); 40 self:onGetContinueClick(self.btn_vip_lianxu);
41 end 41 end
42 self.btn_vip_lianxu_month:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end); 42 self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
43 end 43 end
44 44
45 self.btn_lingqu_month = self:getChildByName("btn_lingqu_month"); 45 self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
...@@ -63,32 +63,15 @@ function ActivityVipView:init() ...@@ -63,32 +63,15 @@ function ActivityVipView:init()
63 63
64 EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate)); 64 EventListener.addEventListener(self, EnumEvent.UPDATE_VIP, handler(self, self.onVipUpdate));
65 65
66 UmengHelper.onEvent("activity_vip_show"); 66 --UmengHelper.onEvent("activity_vip_show");
67 67
68 self.yilingqu_month:setVisible(false); 68 self.yilingqu_month:setVisible(false); --已领取
69 self.yilingqu_year:setVisible(false); 69 self.yilingqu_year:setVisible(false);
70 self.btn_lingqu_month:setVisible(false); 70 self.btn_lingqu_month:setVisible(false); --待领取
71 self.btn_vip_year:setVisible(false);
72 self.btn_lingqu_year:setVisible(false); 71 self.btn_lingqu_year:setVisible(false);
73 local function authCallbackLua(result) 72 self.btn_vip_year:setVisible(false); --包年
74 -- 去鉴权看看有没有订购连续包月 73 self.btn_vip_month:setVisible(false); --包月
75 self.orderStaus = result; 74 self.btn_vip_lianxu:setVisible(false); --续包月
76 if self.orderStaus == "success" then
77 -- 已经订购过
78 self.btn_lingqu_month:setVisible(true);
79 -- 订购过先将可领取按钮弄出来
80 elseif self.orderStaus == "" then
81 -- 鉴权失败
82 else
83 -- 没有订购过，鉴权返回订购产品id
84 end
85
86
87 -- return self:update(true); --处理好订购关系后在更新后续内容
88 end
89 local vipList = ShopInfo.getVipList();
90 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua);
91
92 75
93 return self:update(true); 76 return self:update(true);
94 end 77 end
...@@ -154,8 +137,8 @@ function ActivityVipView:update(_is_init) ...@@ -154,8 +137,8 @@ function ActivityVipView:update(_is_init)
154 end 137 end
155 138
156 local data1 = UserModel.getVipByID(vipInfo1.id); 139 local data1 = UserModel.getVipByID(vipInfo1.id);
157 if data1 and data1.val2 >= UserModel.time_second then 140 if data1 and data1.val2 >= UserModel.time_second then
158 if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then 141 if data1.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data1.val1) then--单包月礼包详情
159 -- 可领取 142 -- 可领取
160 local day = math.floor((data1.val2 - UserModel.time_second) /(24 * 3600)) + 1; 143 local day = math.floor((data1.val2 - UserModel.time_second) /(24 * 3600)) + 1;
161 if data1.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data1.val1) then 144 if data1.val1 > 0 and TimeUtil.isToday(UserModel.time_second, data1.val1) then
...@@ -167,29 +150,31 @@ function ActivityVipView:update(_is_init) ...@@ -167,29 +150,31 @@ function ActivityVipView:update(_is_init)
167 150
168 self.btn_lingqu_month:setVisible(true); 151 self.btn_lingqu_month:setVisible(true);
169 self.btn_lingqu_month.id = vipInfo1.id; 152 self.btn_lingqu_month.id = vipInfo1.id;
170 -- self.btn_lingqu_month:getChildByName("txt"):setString("(剩余" .. day .. "天)");
171 _nodes[1] = { self.btn_lingqu_month }; 153 _nodes[1] = { self.btn_lingqu_month };
172 else 154 else
173 -- 已领取 155 -- 已领取
174 self.btn_lingqu_month:setVisible(false); 156 self.btn_lingqu_month:setVisible(false);
175 self.yilingqu_month:setVisible(true); 157 self.yilingqu_month:setVisible(true);
176 end 158 end
177 elseif not has_vip_month then 159 else
160 self.btn_vip_month:setVisible(true); --显示包月按钮
161 _nodes[1] = { self.btn_vip_month };
162 --[[elseif not has_vip_month then --这里需要改
178 if vipInfo3 then 163 if vipInfo3 then
179 -- self.btn_vip_month:setVisible(true); 164 self.btn_vip_month:setVisible(true);
180 -- _nodes[1] = { self.btn_vip_month }; 165 _nodes[1] = { self.btn_vip_month };
181 else 166 else
182 -- self.btn_vip_month_single:setVisible(true); 167 self.btn_vip_month:setVisible(true);
183 -- _nodes[1] = { self.btn_vip_month_single }; 168 _nodes[1] = { self.btn_vip_month };
184 end 169 end--]]
185 end 170 end
186 171
187 if vipInfo3 then 172 if vipInfo3 then --续包月礼包详情
188 local data3 = UserModel.getVipByID(vipInfo3.id); 173 local data3 = UserModel.getVipByID(vipInfo3.id);
189 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then 174 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
190 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then 175 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
191 -- 可领取 176 -- 可领取
192 -- self.btn_lingqu_month:setVisible(true); 177 self.btn_lingqu_month:setVisible(true);
193 self.btn_lingqu_month.id = vipInfo3.id; 178 self.btn_lingqu_month.id = vipInfo3.id;
194 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久"); 179 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
195 _nodes[1] = { self.btn_lingqu_month }; 180 _nodes[1] = { self.btn_lingqu_month };
...@@ -198,7 +183,14 @@ function ActivityVipView:update(_is_init) ...@@ -198,7 +183,14 @@ function ActivityVipView:update(_is_init)
198 self.btn_lingqu_month:setVisible(false); 183 self.btn_lingqu_month:setVisible(false);
199 self.yilingqu_month:setVisible(true); 184 self.yilingqu_month:setVisible(true);
200 end 185 end
201 elseif not has_vip_month then 186 else --显示续包月按钮
187 self.btn_vip_lianxu:setVisible(true);
188 if #_nodes > 0 then
189 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
190 else
191 _nodes[1] = {self.btn_vip_lianxu};
192 end
193 --elseif not has_vip_month then
202 --[[self.btn_vip_lianxu:setVisible(true); 194 --[[self.btn_vip_lianxu:setVisible(true);
203 if #_nodes > 0 then 195 if #_nodes > 0 then
204 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu; 196 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
...@@ -208,12 +200,12 @@ function ActivityVipView:update(_is_init) ...@@ -208,12 +200,12 @@ function ActivityVipView:update(_is_init)
208 end 200 end
209 end 201 end
210 202
211 if #_nodes > 0 then 203 --[[if #_nodes > 0 then
212 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu_month;
213 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu; 204 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
205 _nodes[1][#_nodes[1] + 1] = self.btn_vip_month;
214 else 206 else
215 _nodes[1] = { self.btn_vip_lianxu_month, self.btn_vip_lianxu }; 207 _nodes[1] = { self.btn_vip_lianxu, self.btn_vip_month };
216 end 208 end--]]
217 209
218 -- 包年 210 -- 包年
219 local vipInfo2 = vipList[2]; 211 local vipInfo2 = vipList[2];
...@@ -233,7 +225,7 @@ function ActivityVipView:update(_is_init) ...@@ -233,7 +225,7 @@ function ActivityVipView:update(_is_init)
233 item:setVisible(false); 225 item:setVisible(false);
234 end 226 end
235 end 227 end
236 local data = UserModel.getVipByID(vipInfo2.id); 228 local data = UserModel.getVipByID(vipInfo2.id); --包年礼包详情
237 if data and data.val2 >= UserModel.time_second then 229 if data and data.val2 >= UserModel.time_second then
238 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then 230 if data.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data.val1) then
239 -- 可领取 231 -- 可领取
...@@ -244,15 +236,16 @@ function ActivityVipView:update(_is_init) ...@@ -244,15 +236,16 @@ function ActivityVipView:update(_is_init)
244 if day < 0 then 236 if day < 0 then
245 day = 0; 237 day = 0;
246 end 238 end
247 --[[self.btn_lingqu_year:setVisible(true); 239 self.btn_lingqu_year:setVisible(true);
248 self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)"); 240 --self.btn_lingqu_year:getChildByName("txt"):setString("(剩余" .. day .. "天)");
249 if not _nodes[1] then 241 if not _nodes[1] then
250 _nodes[1] = { }; 242 _nodes[1] = { };
251 end 243 end
252 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;--]] 244 _nodes[1][#_nodes[1] + 1] = self.btn_lingqu_year;
253 else 245 else
254 -- 已领取 246 -- 已领取
255 -- self.yilingqu_year:setVisible(true); 247 self.btn_lingqu_year:setVisible(false);
248 self.yilingqu_year:setVisible(true);
256 end 249 end
257 else 250 else
258 self.btn_vip_year:setVisible(true); 251 self.btn_vip_year:setVisible(true);
......
...@@ -105,20 +105,23 @@ function XyxPayView:onTouchEnd(event) ...@@ -105,20 +105,23 @@ function XyxPayView:onTouchEnd(event)
105 local p = self.layer:convertToWorldSpace(event:getLocation()); 105 local p = self.layer:convertToWorldSpace(event:getLocation());
106 end 106 end
107 107
108 --单包月
108 function XyxPayView:onMonthVipClick(ref, event) 109 function XyxPayView:onMonthVipClick(ref, event)
109 local vipList = ShopInfo.getVipList(); 110 local vipList = ShopInfo.getVipList();
110 MEMBER_TYPE=vipList[1].id; 111 MEMBER_TYPE=vipList[1].id;
111 local shopInfo = ShopInfo.getPayInfo(vipList[1].id); 112 local shopInfo = ShopInfo.getPayInfo(vipList[1].id);
112 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num, handler(self, self.onPayCallBack)); 113 ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100 , handler(self, self.onPayCallBack));
113 end 114 end
114 115
116 --单包年
115 function XyxPayView:onYearVipClick(ref, event) 117 function XyxPayView:onYearVipClick(ref, event)
116 local vipList = ShopInfo.getVipList(); 118 local vipList = ShopInfo.getVipList();
117 MEMBER_TYPE=vipList[2].id; 119 MEMBER_TYPE=vipList[2].id;
118 local shopInfo = ShopInfo.getPayInfo(vipList[2].id); 120 local shopInfo = ShopInfo.getPayInfo(vipList[2].id);
119 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[2].num, handler(self, self.onPayCallBack)); 121 ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100, handler(self, self.onPayCallBack));
120 end 122 end
121 123
124 --续包月
122 function XyxPayView:onBuyClick(ref, event) 125 function XyxPayView:onBuyClick(ref, event)
123 local vipList = ShopInfo.getVipList(); 126 local vipList = ShopInfo.getVipList();
124 MEMBER_TYPE=vipList[3].id; 127 MEMBER_TYPE=vipList[3].id;
...@@ -126,16 +129,18 @@ function XyxPayView:onBuyClick(ref, event) ...@@ -126,16 +129,18 @@ function XyxPayView:onBuyClick(ref, event)
126 -- 包月卡的id，获取包月卡的item信息 129 -- 包月卡的id，获取包月卡的item信息
127 -- 天津联通支付，支持连续包月 130 -- 天津联通支付，支持连续包月
128 --logUI("ActivityVipView:onGetContinueClick------------------>"); 131 --logUI("ActivityVipView:onGetContinueClick------------------>");
129 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[3].num); 132 ShopModel.pay(shopInfo.product, shopInfo.name, tonumber(shopInfo.rmb)*100, handler(self, self.onPayCallBack));
130 end 133 end
131 134
132 function XyxPayView:onPayCallBack(params) 135 function XyxPayView:onPayCallBack(params)
133 local arr = StringUtil.split(params,","); 136 local arr = StringUtil.split(params,",");
134 logUI("支付返回的信息："..arr[1].."-----------:"..arr[2]); 137 if arr[1] and arr[1] == "success" and arr[2] and arr[3] then --支付成功
135 if arr[1] and arr[1] == "success" then 138 logUI("支付返回的信息："..arr[1].."订单号:"..arr[2].." 流水号:"..arr[3]);
136 SocketClient:getInstance():send("gateway_msg.shanghai_dianxin_pay_msg", 139 SocketClient:getInstance():send("gateway_msg.shanghai_dianxin_pay_msg",
137 { 140 {
138 shanghai_dianxin_pay_id = MEMBER_TYPE, 141 shanghai_dianxin_pay_id = MEMBER_TYPE,
142 order_number=arr[2],
143 order_number=arr[3],
139 } ); 144 } );
140 145
141 if not TableUtil.IsInTable(UserModel.free_game_id, self.game_id) then 146 if not TableUtil.IsInTable(UserModel.free_game_id, self.game_id) then
...@@ -143,7 +148,6 @@ function XyxPayView:onPayCallBack(params) ...@@ -143,7 +148,6 @@ function XyxPayView:onPayCallBack(params)
143 end 148 end
144 149
145 LoadingManager.showDataLoading(); 150 LoadingManager.showDataLoading();
146
147 self:runAction(cc.Sequence:create(cc.DelayTime:create(1), cc.CallFunc:create( function() 151 self:runAction(cc.Sequence:create(cc.DelayTime:create(1), cc.CallFunc:create( function()
148 self:close(); 152 self:close();
149 LoadingManager.removeDataLoading(); 153 LoadingManager.removeDataLoading();
...@@ -152,7 +156,7 @@ function XyxPayView:onPayCallBack(params) ...@@ -152,7 +156,7 @@ function XyxPayView:onPayCallBack(params)
152 end 156 end
153 end ))); 157 end )));
154 end 158 end
155 logUI("小游戏支付返回：" .. params); 159 --logUI("小游戏支付返回：" .. params);
156 end 160 end
157 161
158 function XyxPayView:onClose() 162 function XyxPayView:onClose()
...@@ -183,7 +187,7 @@ end ...@@ -183,7 +187,7 @@ end
183 187
184 -- 左键处理函数 188 -- 左键处理函数
185 function XyxPayView:onKeypadLeft() 189 function XyxPayView:onKeypadLeft()
186 XyxPayView.super.onKeypadLeft(self, false, true, false, true, false); 190 XyxPayView.super.onKeypadLeft(self, true, true, true, true, true);
187 end 191 end
188 192
189 -- 右键处理函数 193 -- 右键处理函数
...@@ -193,7 +197,7 @@ end ...@@ -193,7 +197,7 @@ end
193 197
194 function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight) 198 function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight)
195 -- logD("near_node--------------------->"..near_node.tag); 199 -- logD("near_node--------------------->"..near_node.tag);
196 for i, v in ipairs(self.nodes) do 200 --[[for i, v in ipairs(self.nodes) do
197 for index, node in ipairs(v) do 201 for index, node in ipairs(v) do
198 node:setScale(0.50); 202 node:setScale(0.50);
199 end 203 end
...@@ -202,6 +206,12 @@ function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight) ...@@ -202,6 +206,12 @@ function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight)
202 if near_node:getName() == "btn_buy" or near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then 206 if near_node:getName() == "btn_buy" or near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then
203 near_node:setScale(0.65); 207 near_node:setScale(0.65);
204 -- 选中放大 208 -- 选中放大
209 end--]]
210
211 if near_node:getName()=="btn_buy" then --续包月
212 self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt2.png"):getSpriteFrame());
213 elseif near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then --包月
214 self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt.png"):getSpriteFrame());
205 end 215 end
206 216
207 XyxPayView.super.updateSelectedState(self, near_node, isBounce, is_show_highlight); 217 XyxPayView.super.updateSelectedState(self, near_node, isBounce, is_show_highlight);
......
...@@ -27,7 +27,8 @@ local function main() ...@@ -27,7 +27,8 @@ local function main()
27 PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr"); 27 PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
28 PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr"); 28 PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
29 IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv")); 29 IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
30 --MEMBER_TYPE=0; --会员类型，0:不是会员, 其他对应pay.xml中的pay_id 30 MEMBER_TYPE=0; --会员类型，0:不是会员, 其他对应pay.xml中的pay_id
31 IS_MEMBER=0; --是不是会员 0：不是会员
31 32
32 require "core.log.init"; 33 require "core.log.init";
33 require "core.net.socket_connection"; 34 require "core.net.socket_connection";
...@@ -44,10 +45,42 @@ local function main() ...@@ -44,10 +45,42 @@ local function main()
44 print("本地配置 平台号PLATFORM:"..PLATFORM); 45 print("本地配置 平台号PLATFORM:"..PLATFORM);
45 end 46 end
46 47
48 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
49 self:isMember();
50 end
51
47 cc.Director:getInstance():setAnimationInterval(1/30); 52 cc.Director:getInstance():setAnimationInterval(1/30);
48 require("app.MyApp"):create():run("LoadingScene"); 53 require("app.MyApp"):create():run("LoadingScene");
49 end 54 end
50 55
56 --判断是不是会员
57 function isMember()
58 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
59 local function callbackLua(params)
60 logUI("IS MEMEBER---->"..params);
61 if params=="success" then
62 IS_MEMBER=1;
63 else
64 IS_MEMBER=0;
65 end
66 end
67 local luaj = require "cocos.cocos2d.luaj"; --引入luaj
68 local className = "org/cocos2dx/lua/AppActivity";
69 local args = { callbackLua };
70 local sigs = "(I)V";
71 -- 传入string参数，无返回值
72
73 -- luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
74 -- luaj.callStaticMethod() 会返回两个值
75 -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
76 -- 当失败时，第一个值为 false，第二个值是错误代码
77 local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
78 if not ok then
79 print("authPermission error:" .. ret);
80 end
81
82 end
83
51 function reloadGame() 84 function reloadGame()
52 for k,_ in pairs(package.loaded) do 85 for k,_ in pairs(package.loaded) do
53 local has_k = false; 86 local has_k = false;
......

6.65 KB | W: | H:

95.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <CColor A="255" R="255" G="255" B="255" /> 55 <CColor A="255" R="255" G="255" B="255" />
56 <PrePosition X="0.2006" Y="0.3436" /> 56 <PrePosition X="0.2006" Y="0.3436" />
57 <PreSize X="0.5889" Y="0.9491" /> 57 <PreSize X="0.5889" Y="0.9491" />
58 <FileData Type="Normal" Path="ui/Activity/bg_gift_one_month.png" Plist="" /> 58 <FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_month.png" Plist="" />
59 </AbstractNodeData> 59 </AbstractNodeData>
60 <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"> 60 <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">
61 <Size X="418.0000" Y="522.0000" /> 61 <Size X="418.0000" Y="522.0000" />
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
65 <CColor A="255" R="255" G="255" B="255" /> 65 <CColor A="255" R="255" G="255" B="255" />
66 <PrePosition X="0.7630" Y="0.3485" /> 66 <PrePosition X="0.7630" Y="0.3485" />
67 <PreSize X="0.5160" Y="0.9491" /> 67 <PreSize X="0.5160" Y="0.9491" />
68 <FileData Type="Normal" Path="ui/Activity/bg_gift_one_year.png" Plist="" /> 68 <FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_year.png" Plist="" />
69 </AbstractNodeData> 69 </AbstractNodeData>
70 <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"> 70 <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">
71 <Size X="162.0000" Y="60.0000" /> 71 <Size X="162.0000" Y="60.0000" />
72 <Children> 72 <Children>
73 <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 73 <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 </AbstractNodeData> 105 </AbstractNodeData>
106 </Children> 106 </Children>
107 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 107 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
108 <Position X="59.0315" Y="23.3800" /> 108 <Position X="59.0490" Y="23.3800" />
109 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 109 <Scale ScaleX="1.0000" ScaleY="1.0000" />
110 <CColor A="255" R="255" G="255" B="255" /> 110 <CColor A="255" R="255" G="255" B="255" />
111 <PrePosition X="0.0729" Y="0.0425" /> 111 <PrePosition X="0.0729" Y="0.0425" />
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 <OutlineColor A="255" R="255" G="0" B="0" /> 117 <OutlineColor A="255" R="255" G="0" B="0" />
118 <ShadowColor A="255" R="110" G="110" B="110" /> 118 <ShadowColor A="255" R="110" G="110" B="110" />
119 </AbstractNodeData> 119 </AbstractNodeData>
120 <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"> 120 <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">
121 <Size X="162.0000" Y="60.0000" /> 121 <Size X="162.0000" Y="60.0000" />
122 <Children> 122 <Children>
123 <AbstractNodeData Name="selected" ActionTag="2138735712" Tag="207" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 123 <AbstractNodeData Name="selected" ActionTag="2138735712" Tag="207" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </AbstractNodeData> 145 </AbstractNodeData>
146 </Children> 146 </Children>
147 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 147 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
148 <Position X="263.6058" Y="23.1693" /> 148 <Position X="263.5740" Y="23.1693" />
149 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 149 <Scale ScaleX="1.0000" ScaleY="1.0000" />
150 <CColor A="255" R="255" G="255" B="255" /> 150 <CColor A="255" R="255" G="255" B="255" />
151 <PrePosition X="0.3254" Y="0.0421" /> 151 <PrePosition X="0.3254" Y="0.0421" />
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
157 <OutlineColor A="255" R="255" G="0" B="0" /> 157 <OutlineColor A="255" R="255" G="0" B="0" />
158 <ShadowColor A="255" R="110" G="110" B="110" /> 158 <ShadowColor A="255" R="110" G="110" B="110" />
159 </AbstractNodeData> 159 </AbstractNodeData>
160 <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"> 160 <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">
161 <Size X="162.0000" Y="60.0000" /> 161 <Size X="162.0000" Y="60.0000" />
162 <Children> 162 <Children>
163 <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 163 <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
218 <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" /> 218 <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
219 <BlendFunc Src="1" Dst="771" /> 219 <BlendFunc Src="1" Dst="771" />
220 </AbstractNodeData> 220 </AbstractNodeData>
221 <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"> 221 <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">
222 <Size X="162.0000" Y="60.0000" /> 222 <Size X="162.0000" Y="60.0000" />
223 <Children> 223 <Children>
224 <AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 224 <AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
257 </AbstractNodeData> 257 </AbstractNodeData>
258 </Children> 258 </Children>
259 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 259 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
260 <Position X="642.6255" Y="22.6823" /> 260 <Position X="642.6540" Y="22.6823" />
261 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 261 <Scale ScaleX="1.0000" ScaleY="1.0000" />
262 <CColor A="255" R="255" G="255" B="255" /> 262 <CColor A="255" R="255" G="255" B="255" />
263 <PrePosition X="0.7934" Y="0.0412" /> 263 <PrePosition X="0.7934" Y="0.0412" />
......
1 <UserData Version="3.10.0.0">
2 <Properties>
3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" />
5 </Item>
6 </Properties>
7 </UserData>
...\ No newline at end of file ...\ 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 @@ ...@@ -3,7 +3,7 @@
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData"> 4 <Value ctype="GuidesData">
5 <HorizontalList> 5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="151.2523" /> 6 <Guides Direction="Horizontal" Position="439.8254" />
7 </HorizontalList> 7 </HorizontalList>
8 <VerticalList> 8 <VerticalList>
9 <Guides Position="640.6776" /> 9 <Guides Position="640.6776" />
......
...@@ -780,6 +780,7 @@ ...@@ -780,6 +780,7 @@
780 <Image Name="bg_match_9_03.png" /> 780 <Image Name="bg_match_9_03.png" />
781 <Image Name="bg_match_9_04.png" /> 781 <Image Name="bg_match_9_04.png" />
782 <Image Name="bg_match_9_05.png" /> 782 <Image Name="bg_match_9_05.png" />
783 <Image Name="bg_match_9_shdx.png" />
783 <Image Name="bg_match_background.png" /> 784 <Image Name="bg_match_background.png" />
784 <Image Name="bg_match_check_001.png" /> 785 <Image Name="bg_match_check_001.png" />
785 <Image Name="bg_match_check_01.png" /> 786 <Image Name="bg_match_check_01.png" />
...@@ -815,6 +816,7 @@ ...@@ -815,6 +816,7 @@
815 <Image Name="match_10_caomei.png" /> 816 <Image Name="match_10_caomei.png" />
816 <Image Name="match_10_ci.png" /> 817 <Image Name="match_10_ci.png" />
817 <Image Name="match_10_girl.png" /> 818 <Image Name="match_10_girl.png" />
819 <Image Name="match_10_girl_shdx.png" />
818 <Image Name="match_10_juzi.png" /> 820 <Image Name="match_10_juzi.png" />
819 <Image Name="match_10_logo.png" /> 821 <Image Name="match_10_logo.png" />
820 <Image Name="match_10_tang.png" /> 822 <Image Name="match_10_tang.png" />
...@@ -827,9 +829,16 @@ ...@@ -827,9 +829,16 @@
827 <Project Name="MatchRewardLayer.csd" Type="Layer" /> 829 <Project Name="MatchRewardLayer.csd" Type="Layer" />
828 <Image Name="rabbit.png" /> 830 <Image Name="rabbit.png" />
829 <Image Name="rabbit_logo.png" /> 831 <Image Name="rabbit_logo.png" />
832 <Image Name="rabbit_shdx.png" />
830 <Image Name="tiger.png" /> 833 <Image Name="tiger.png" />
834 <Image Name="tiger_shdx.png" />
831 <Image Name="who_am_i.png" /> 835 <Image Name="who_am_i.png" />
832 </Folder> 836 </Folder>
837 <Folder Name="shanghai_ctcc">
838 <Project Name="ActivityVip.csd" Type="Layer" />
839 <Image Name="bg_gift_month.png" />
840 <Image Name="bg_gift_year.png" />
841 </Folder>
833 <Folder Name="tianjin_cucc"> 842 <Folder Name="tianjin_cucc">
834 <Project Name="ActivityVip.csd" Type="Layer" /> 843 <Project Name="ActivityVip.csd" Type="Layer" />
835 <Image Name="bg_activity.png" /> 844 <Image Name="bg_activity.png" />
...@@ -964,9 +973,6 @@ ...@@ -964,9 +973,6 @@
964 <Image Name="turntable_show_time.png" /> 973 <Image Name="turntable_show_time.png" />
965 <Image Name="vip_title.png" /> 974 <Image Name="vip_title.png" />
966 <Image Name="yilingqu.png" /> 975 <Image Name="yilingqu.png" />
967 <Folder Name="shanghai_ctcc">
968 <Project Name="ActivityVip.csd" Type="Layer" />
969 </Folder>
970 </Folder> 976 </Folder>
971 <Folder Name="chenghao"> 977 <Folder Name="chenghao">
972 <Image Name="bg_chenghao_get.png" /> 978 <Image Name="bg_chenghao_get.png" />
...@@ -1467,10 +1473,13 @@ ...@@ -1467,10 +1473,13 @@
1467 <Image Name="bg_middle.png" /> 1473 <Image Name="bg_middle.png" />
1468 <Image Name="bg_middle_select.png" /> 1474 <Image Name="bg_middle_select.png" />
1469 <Image Name="bg_pay.png" /> 1475 <Image Name="bg_pay.png" />
1476 <Image Name="bg_pic.png" />
1470 <Image Name="bg_right.png" /> 1477 <Image Name="bg_right.png" />
1471 <Image Name="bg_right_select.png" /> 1478 <Image Name="bg_right_select.png" />
1472 <Image Name="btn_back.png" /> 1479 <Image Name="btn_back.png" />
1473 <Image Name="btn_back_select.png" /> 1480 <Image Name="btn_back_select.png" />
1481 <Image Name="txt.png" />
1482 <Image Name="txt2.png" />
1474 <Project Name="XyxPayLayer.csd" Type="Layer" /> 1483 <Project Name="XyxPayLayer.csd" Type="Layer" />
1475 </Folder> 1484 </Folder>
1476 <Folder Name="tianjin_cucc"> 1485 <Folder Name="tianjin_cucc">
......
...@@ -28,5 +28,17 @@ ...@@ -28,5 +28,17 @@
28 <LastRunType Value="Windows" /> 28 <LastRunType Value="Windows" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/dress/BusinessView.csd" />
35 <FilePathData Path="ui/dress/DressLayer.csd" />
36 <FilePathData Path="ui/achievement/AchievementItem.csd" />
37 <FilePathData Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
38 <FilePathData Path="ui/Activity/shanghai_ctcc/ActivityVip.csd" />
39 </OpenedDocuments>
40 <ActiveDocument Path="ui/xyx/shanghai_ctcc/XyxPayLayer.csd" />
41 </Value>
42 </Item>
31 </Properties> 43 </Properties>
32 </UserData> 44 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -214,7 +214,7 @@ enum E_STATISTICS_TYPE ...@@ -214,7 +214,7 @@ enum E_STATISTICS_TYPE
214 214
215 E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID) 215 E_STATISTICS_TYPE_14 = 14;//所有玩家购买宠物钥匙个数(宠物钥匙ID)
216 216
217 E_STATISTICS_TYPE_15 = 15;//上海电信付费 217 E_STATISTICS_TYPE_15 = 15;//上海电信付费(pay_id,order_number,serial_number)
218 218
219 219
220 220
......
...@@ -189,6 +189,8 @@ message get_pay_day_reward_msg_res ...@@ -189,6 +189,8 @@ message get_pay_day_reward_msg_res
189 message shanghai_dianxin_pay_msg//1,0x00353#上海电信支付成功 189 message shanghai_dianxin_pay_msg//1,0x00353#上海电信支付成功
190 { 190 {
191 optional uint32 shanghai_dianxin_pay_id = 1;//上海电信会员支付ID(0:不是会员, 其他对应pay.xml中的pay_id) 191 optional uint32 shanghai_dianxin_pay_id = 1;//上海电信会员支付ID(0:不是会员, 其他对应pay.xml中的pay_id)
192 optional string order_number = 2;//订单号
193 optional string serial_number = 3;//流水号
192 } 194 }
193 195
194 message shanghai_dianxin_pay_msg_res 196 message shanghai_dianxin_pay_msg_res
......
...@@ -43,6 +43,7 @@ enum E_PLATFORM ...@@ -43,6 +43,7 @@ enum E_PLATFORM
43 E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通 43 E_PLATFORM_XHX_TIANJING_LIANGTONG = 103;//天津联通
44 E_PLATFORM_XHX_DANG_BEI = 104;//当贝 44 E_PLATFORM_XHX_DANG_BEI = 104;//当贝
45 E_PLATFORM_XHX_DA_TANG = 105;//大唐 45 E_PLATFORM_XHX_DA_TANG = 105;//大唐
46 E_PLATFORM_XHX_SICHUAN_YIDONG = 107;//四川移动
46 47
47 48
48 49
......
...@@ -12,6 +12,13 @@ message save_msg//1,0x60001#保存统计数据 ...@@ -12,6 +12,13 @@ message save_msg//1,0x60001#保存统计数据
12 repeated uint32 expand_param = 4;//扩展参数 12 repeated uint32 expand_param = 4;//扩展参数
13 } 13 }
14 14
15 message save_string_msg//1,0x60002#保存统计数据
16 {
17 optional uint32 platform = 1;//平台ID
18 optional uint32 event_id = 3;//事件ID
19 repeated string expand_param = 4;//扩展参数
20 }
21
15 message load_rank_msg_res 22 message load_rank_msg_res
16 { 23 {
17 } 24 }
...\ No newline at end of file ...\ No newline at end of file
......