Skip to content

金学艇 / xhx

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

0723

1 parent 21b032a8
Inline Side-by-side
Showing 25 changed files with 342 additions and 445 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800278b87c21</Account> 6 <Account>m0800278b87c87</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>603</feiyanzoubi_best> 28 <feiyanzoubi_best>603</feiyanzoubi_best>
29 <uid>1030100010142926</uid> 29 <uid>1010100010254572</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1107</bird_best> 31 <bird_best>1107</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="10"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="15"/> 48 <common id="24" val="9999999"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="1"/> 51 <common id="10000" val="1"/>
......
...@@ -2297,7 +2297,7 @@ ...@@ -2297,7 +2297,7 @@
2297 flag:1:使用指定的宠物组.0:按照参数随机(默认0) 2297 flag:1:使用指定的宠物组.0:按照参数随机(默认0)
2298 --> 2298 -->
2299 2299
2300 <user id="1001" name="对手1001" pk_val="500" petstar="0,0" lv="0,0" skill="0" flag="1"> 2300 <user id="1001" name="对手1001" pk_val="100" petstar="0,0" lv="0,0" skill="0" flag="1">
2301 <!-- 2301 <!--
2302 id//id 2302 id//id
2303 lv//等级 2303 lv//等级
...@@ -2308,15 +2308,25 @@ ...@@ -2308,15 +2308,25 @@
2308 --> 2308 -->
2309 <pet id="10001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/> 2309 <pet id="10001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
2310 <pet id="10002" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/> 2310 <pet id="10002" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2311 <pet id="10003" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2311 <pet id="10008" lv="1" skill_id="4000" ack="2" hp="4" congming="10"/>
2312 <pet id="10004" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2312 <pet id="10010" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2313 <pet id="10005" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/> 2313 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2314 <pet id="10006" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/> 2314 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2315 2315 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
2316 2316 <pet id="20006" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2317 <pet id="20009" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2318 <pet id="20010" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2319 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2320 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2321 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2322 <pet id="30008" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2323 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2324 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2325
2326
2317 </user> 2327 </user>
2318 2328
2319 <user id="1002" name="对手1002" pk_val="1000" petstar="0,0" lv="0,0" skill="0" flag="0"> 2329 <user id="1002" name="对手1002" pk_val="500" petstar="0,0" lv="0,0" skill="0" flag="0">
2320 <!-- 2330 <!--
2321 id//id 2331 id//id
2322 lv//等级 2332 lv//等级
...@@ -2418,7 +2428,7 @@ ...@@ -2418,7 +2428,7 @@
2418 2428
2419 </user> 2429 </user>
2420 2430
2421 <user id="1003" name="对手1003" pk_val="2000" petstar="0,0" lv="1,1" skill="1" flag="0"> 2431 <user id="1003" name="对手1003" pk_val="9999999" petstar="0,0" lv="3,1" skill="1" flag="0">
2422 <!-- 2432 <!--
2423 id//id 2433 id//id
2424 lv//等级 2434 lv//等级
...@@ -2566,154 +2576,5 @@ ...@@ -2566,154 +2576,5 @@
2566 2576
2567 2577
2568 </user> 2578 </user>
2569
2570 <user id="1004" name="对手1004" pk_val="9999999" petstar="1,1" lv="1,1" skill="1" flag="0">
2571 <!--
2572 id//id
2573 lv//等级
2574 skill_id//解锁技能ID
2575 ack//攻击力
2576 hp//血
2577 congming//聪明
2578 -->
2579 <pet id="10001" lv="8" skill_id="3006" ack="2" hp="4" congming="80"/>
2580 <pet id="10002" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
2581 <pet id="10003" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
2582 <pet id="10004" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
2583 <pet id="10005" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
2584 <pet id="10006" lv="8" skill_id="3003" ack="1" hp="6" congming="80"/>
2585 <pet id="10007" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
2586 <pet id="10008" lv="8" skill_id="4000" ack="2" hp="4" congming="80"/>
2587 <pet id="10009" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
2588 <pet id="10010" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
2589 <pet id="10011" lv="8" skill_id="4002" ack="2" hp="5" congming="80"/>
2590 <pet id="10012" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
2591 <pet id="10013" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
2592 <pet id="10014" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
2593 <pet id="10015" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
2594 <pet id="10016" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
2595 <pet id="10017" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
2596 <pet id="10018" lv="8" skill_id="4007" ack="2" hp="6" congming="80"/>
2597 <pet id="10019" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
2598 <pet id="10020" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
2599 <pet id="10021" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
2600 <pet id="10022" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2601 <pet id="10023" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2602 <pet id="10024" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
2603 <pet id="10027" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
2604 <pet id="10029" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
2605 <pet id="10032" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
2606 <pet id="10052" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
2607 <pet id="10057" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
2608 <pet id="10058" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
2609 <pet id="20001" lv="8" skill_id="3006" ack="2" hp="4" congming="80"/>
2610 <pet id="20002" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
2611 <pet id="20003" lv="8" skill_id="4002" ack="2" hp="6" congming="80"/>
2612 <pet id="20004" lv="8" skill_id="4007" ack="1" hp="6" congming="80"/>
2613 <pet id="20005" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
2614 <pet id="20006" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
2615 <pet id="20007" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
2616 <pet id="20008" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
2617 <pet id="20009" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
2618 <pet id="20010" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
2619 <pet id="20011" lv="8" skill_id="1009" ack="1" hp="6" congming="80"/>
2620 <pet id="20012" lv="8" skill_id="3007" ack="1" hp="1" congming="80"/>
2621 <pet id="20013" lv="8" skill_id="3001" ack="2" hp="4" congming="80"/>
2622 <pet id="20014" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
2623 <pet id="20015" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
2624 <pet id="20016" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
2625 <pet id="20017" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
2626 <pet id="20018" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
2627 <pet id="20019" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
2628 <pet id="20020" lv="8" skill_id="3003" ack="1" hp="6" congming="80"/>
2629 <pet id="20021" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
2630 <pet id="20022" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
2631 <pet id="20023" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
2632 <pet id="20024" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2633 <pet id="20025" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
2634 <pet id="20026" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
2635 <pet id="20028" lv="8" skill_id="1004" ack="2" hp="1" congming="80"/>
2636 <pet id="20029" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
2637 <pet id="20035" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
2638 <pet id="20038" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
2639 <pet id="20046" lv="8" skill_id="1010" ack="2" hp="5" congming="80"/>
2640 <pet id="20047" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
2641 <pet id="20048" lv="8" skill_id="3000" ack="2" hp="4" congming="80"/>
2642 <pet id="30001" lv="8" skill_id="2003" ack="2" hp="5" congming="80"/>
2643 <pet id="30003" lv="8" skill_id="1004" ack="2" hp="4" congming="80"/>
2644 <pet id="30004" lv="8" skill_id="1016" ack="2" hp="5" congming="80"/>
2645 <pet id="30005" lv="8" skill_id="1014" ack="2" hp="5" congming="80"/>
2646 <pet id="30006" lv="8" skill_id="2007" ack="1" hp="6" congming="80"/>
2647 <pet id="30007" lv="8" skill_id="4007" ack="1" hp="6" congming="80"/>
2648 <pet id="30008" lv="8" skill_id="2003" ack="2" hp="4" congming="80"/>
2649 <pet id="30009" lv="8" skill_id="2001" ack="3" hp="4" congming="80"/>
2650 <pet id="30010" lv="8" skill_id="1008" ack="2" hp="5" congming="80"/>
2651 <pet id="30011" lv="8" skill_id="4002" ack="2" hp="5" congming="80"/>
2652 <pet id="30012" lv="8" skill_id="2002" ack="2" hp="5" congming="80"/>
2653 <pet id="30013" lv="8" skill_id="2000" ack="1" hp="7" congming="80"/>
2654 <pet id="30014" lv="8" skill_id="1002" ack="2" hp="4" congming="80"/>
2655 <pet id="30016" lv="8" skill_id="4006" ack="2" hp="5" congming="80"/>
2656 <pet id="30017" lv="8" skill_id="1000" ack="3" hp="5" congming="80"/>
2657 <pet id="30018" lv="8" skill_id="1007" ack="1" hp="6" congming="80"/>
2658 <pet id="30019" lv="8" skill_id="2001" ack="4" hp="4" congming="80"/>
2659 <pet id="30020" lv="8" skill_id="4009" ack="3" hp="5" congming="80"/>
2660 <pet id="30021" lv="8" skill_id="2000" ack="1" hp="9" congming="80"/>
2661 <pet id="30022" lv="8" skill_id="4008" ack="2" hp="6" congming="80"/>
2662 <pet id="30026" lv="8" skill_id="1010" ack="2" hp="5" congming="80"/>
2663 <pet id="30027" lv="8" skill_id="3000" ack="2" hp="4" congming="80"/>
2664 <pet id="30028" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2665 <pet id="30029" lv="8" skill_id="1003" ack="2" hp="6" congming="80"/>
2666 <pet id="30036" lv="8" skill_id="1004" ack="3" hp="4" congming="80"/>
2667 <pet id="30037" lv="8" skill_id="2002" ack="2" hp="4" congming="80"/>
2668 <pet id="30038" lv="8" skill_id="2002" ack="1" hp="6" congming="80"/>
2669 <pet id="30039" lv="8" skill_id="1001" ack="2" hp="6" congming="80"/>
2670 <pet id="30040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
2671 <pet id="10023" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2672 <pet id="10024" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
2673 <pet id="10025" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
2674 <pet id="10026" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
2675 <pet id="10028" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
2676 <pet id="10031" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
2677 <pet id="10034" lv="8" skill_id="4002" ack="3" hp="5" congming="80"/>
2678 <pet id="10035" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
2679 <pet id="10043" lv="8" skill_id="3000" ack="3" hp="6" congming="80"/>
2680 <pet id="10047" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
2681 <pet id="10053" lv="8" skill_id="2007" ack="3" hp="6" congming="80"/>
2682 <pet id="10054" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
2683 <pet id="10056" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
2684 <pet id="20030" lv="8" skill_id="4001" ack="1" hp="10" congming="80"/>
2685 <pet id="20031" lv="8" skill_id="2007" ack="3" hp="6" congming="80"/>
2686 <pet id="20032" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2687 <pet id="20033" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
2688 <pet id="20034" lv="8" skill_id="4000" ack="2" hp="6" congming="80"/>
2689 <pet id="20036" lv="8" skill_id="3006" ack="2" hp="6" congming="80"/>
2690 <pet id="20037" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
2691 <pet id="20039" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
2692 <pet id="20040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
2693 <pet id="20042" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
2694 <pet id="20043" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
2695 <pet id="20044" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
2696 <pet id="20045" lv="8" skill_id="4004" ack="2" hp="7" congming="80"/>
2697 <pet id="20049" lv="8" skill_id="1017" ack="4" hp="8" congming="80"/>
2698 <pet id="20051" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
2699 <pet id="20052" lv="8" skill_id="1018" ack="4" hp="5" congming="80"/>
2700 <pet id="20053" lv="8" skill_id="1017" ack="2" hp="8" congming="80"/>
2701 <pet id="30002" lv="8" skill_id="2000" ack="1" hp="10" congming="80"/>
2702 <pet id="30030" lv="8" skill_id="4002" ack="3" hp="5" congming="80"/>
2703 <pet id="30031" lv="8" skill_id="1006" ack="3" hp="5" congming="80"/>
2704 <pet id="30032" lv="8" skill_id="1018" ack="5" hp="6" congming="80"/>
2705 <pet id="30033" lv="8" skill_id="1012" ack="4" hp="8" congming="80"/>
2706 <pet id="30034" lv="8" skill_id="1011" ack="3" hp="9" congming="80"/>
2707 <pet id="30035" lv="8" skill_id="1017" ack="4" hp="8" congming="80"/>
2708 <pet id="30040" lv="8" skill_id="4003" ack="3" hp="5" congming="80"/>
2709 <pet id="30042" lv="8" skill_id="4000" ack="2" hp="6" congming="80"/>
2710 <pet id="30043" lv="8" skill_id="1006" ack="2" hp="6" congming="80"/>
2711 <pet id="30047" lv="8" skill_id="3001" ack="2" hp="6" congming="80"/>
2712 <pet id="30048" lv="8" skill_id="3004" ack="2" hp="7" congming="80"/>
2713 <pet id="30049" lv="8" skill_id="4001" ack="2" hp="9" congming="80"/>
2714 <pet id="30050" lv="8" skill_id="3003" ack="2" hp="7" congming="80"/>
2715
2716
2717 </user>
2718 </ai> 2579 </ai>
2719 </root> 2580 </root>
......
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
36 <step id="1" reward="100001,100"/> 36 <step id="1" reward="100001,100"/>
37 </task> 37 </task>
38 <task id="10" name="购买钻石" pic="icon_diamond.png" desc="购买钻石1次"> 38 <task id="10" name="购买钻石" pic="icon_diamond.png" desc="购买钻石1次">
39 <step id="1" reward="100001,100"/> 39 <step id="1" reward="100001,1000"/>
40 </task> 40 </task>
41 </root> 41 </root>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -39,6 +39,9 @@ function SingleGameInfo.get_game_info(id) ...@@ -39,6 +39,9 @@ function SingleGameInfo.get_game_info(id)
39 for i,v in ipairs(_list) do 39 for i,v in ipairs(_list) do
40 if v.id == id then 40 if v.id == id then
41 info = v; 41 info = v;
42 if v.id==10 and CHANNEL=="ws" then
43 info.name="火箭小象";
44 end
42 end 45 end
43 end 46 end
44 return info; 47 return info;
......
...@@ -8,19 +8,15 @@ local runningScene = nil; ...@@ -8,19 +8,15 @@ local runningScene = nil;
8 local lastPopTime = 0; 8 local lastPopTime = 0;
9 9
10 local function showPopItem() 10 local function showPopItem()
11 logUI("6666");
12 if not isPopping then 11 if not isPopping then
13 logUI("7777= "..#queuePopList);
14 if #queuePopList > 0 then 12 if #queuePopList > 0 then
15 isPopping = true; 13 isPopping = true;
16 logUI("11111");
17 local obj = queuePopList[1]; 14 local obj = queuePopList[1];
18 table.remove(queuePopList,1); 15 table.remove(queuePopList,1);
19 16
20 local PopItem = cc.CSLoader:createNode("ui/PopItem.csb"); 17 local PopItem = cc.CSLoader:createNode("ui/PopItem.csb");
21 local rect = PopItem:getBoundingBox(); 18 local rect = PopItem:getBoundingBox();
22 PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2)); 19 PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
23 logUI("2222");
24 local icon = PopItem:getChildByName("icon"); 20 local icon = PopItem:getChildByName("icon");
25 icon:loadTexture("res/icon/"..obj.id..".png"); 21 icon:loadTexture("res/icon/"..obj.id..".png");
26 local item_amount = PopItem:getChildByName("item_amount"); 22 local item_amount = PopItem:getChildByName("item_amount");
...@@ -28,7 +24,6 @@ logUI("6666"); ...@@ -28,7 +24,6 @@ logUI("6666");
28 item_amount:setString(itemInfo.name.."* "..obj.num); 24 item_amount:setString(itemInfo.name.."* "..obj.num);
29 25
30 runningScene:addChild(PopItem,dialog.ZORDER_POP+1); 26 runningScene:addChild(PopItem,dialog.ZORDER_POP+1);
31 logUI("33333");
32 local function fadeOutBack() 27 local function fadeOutBack()
33 PopItem:removeSelf(); 28 PopItem:removeSelf();
34 29
...@@ -41,14 +36,10 @@ logUI("6666"); ...@@ -41,14 +36,10 @@ logUI("6666");
41 local moveBy = cc.MoveBy:create(1, cc.p(0, 200)); 36 local moveBy = cc.MoveBy:create(1, cc.p(0, 200));
42 PopItem:runAction(moveBy); 37 PopItem:runAction(moveBy);
43 PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack))); 38 PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack)));
44 logUI("4444");
45 local function nextPopFun() 39 local function nextPopFun()
46 isPopping = false; 40 isPopping = false;
47 logUI("0000");
48 showPopItem(); 41 showPopItem();
49 end 42 end
50 logUI("5555");
51 print("ItemManater showPopItem==================",runningScene);
52 runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun))); 43 runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun)));
53 end 44 end
54 end 45 end
...@@ -65,7 +56,6 @@ function ItemManager.addPopItem(ID,num) ...@@ -65,7 +56,6 @@ function ItemManager.addPopItem(ID,num)
65 runningScene = cc.Director:getInstance():getRunningScene(); 56 runningScene = cc.Director:getInstance():getRunningScene();
66 end 57 end
67 queuePopList[#queuePopList+1] = obj; 58 queuePopList[#queuePopList+1] = obj;
68 print("ItemManager runningScene================ ",runningScene);
69 59
70 -- if ID == 100001 then 60 -- if ID == 100001 then
71 -- ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold")) 61 -- ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold"))
......
...@@ -170,16 +170,19 @@ function GameStartView:onStart() ...@@ -170,16 +170,19 @@ function GameStartView:onStart()
170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
171 paySuccessFun(); 171 paySuccessFun();
172 else 172 else
173 if CHANNEL=="shdx" then 173 local function okFun()
174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 174 if CHANNEL == "shdx" then
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 175 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
176 elseif CHANNEL=="cucc" then 176 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 177 elseif CHANNEL == "cucc" then
178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 178 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
179 else 179 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 180 else
181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 181 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
182 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
183 end
182 end 184 end
185 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
183 end 186 end
184 return; 187 return;
185 else 188 else
......
...@@ -123,16 +123,19 @@ function GameStartView:onStart() ...@@ -123,16 +123,19 @@ function GameStartView:onStart()
123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
124 paySuccessFun(); 124 paySuccessFun();
125 else 125 else
126 if CHANNEL=="shdx" then 126 local function okFun()
127 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 127 if CHANNEL == "shdx" then
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 128 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
129 elseif CHANNEL=="cucc" then 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
130 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 130 elseif CHANNEL == "cucc" then
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 131 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
132 else 132 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
133 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 133 else
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 134 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
136 end
135 end 137 end
138 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
136 end 139 end
137 return; 140 return;
138 else 141 else
......
...@@ -123,16 +123,19 @@ function GameStartView:onStart() ...@@ -123,16 +123,19 @@ function GameStartView:onStart()
123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 123 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
124 paySuccessFun(); 124 paySuccessFun();
125 else 125 else
126 if CHANNEL=="shdx" then 126 local function okFun()
127 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 127 if CHANNEL == "shdx" then
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 128 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
129 elseif CHANNEL=="cucc" then 129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
130 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 130 elseif CHANNEL == "cucc" then
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 131 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
132 else 132 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
133 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 133 else
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 134 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
136 end
135 end 137 end
138 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
136 end 139 end
137 return; 140 return;
138 else 141 else
......
...@@ -159,16 +159,19 @@ function GameStartView:onStart() ...@@ -159,16 +159,19 @@ function GameStartView:onStart()
159 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 159 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
160 paySuccessFun(); 160 paySuccessFun();
161 else 161 else
162 if CHANNEL=="shdx" then 162 local function okFun()
163 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 163 if CHANNEL == "shdx" then
164 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 164 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
165 elseif CHANNEL=="cucc" then 165 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
166 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 166 elseif CHANNEL == "cucc" then
167 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 167 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
168 else 168 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
169 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 169 else
170 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 170 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
172 end
171 end 173 end
174 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
172 end 175 end
173 return; 176 return;
174 else 177 else
......
...@@ -129,16 +129,19 @@ function GameStartView:onStart() ...@@ -129,16 +129,19 @@ function GameStartView:onStart()
129 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 129 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
130 paySuccessFun(); 130 paySuccessFun();
131 else 131 else
132 if CHANNEL=="shdx" then 132 local function okFun()
133 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 133 if CHANNEL == "shdx" then
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 134 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
135 elseif CHANNEL=="cucc" then 135 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
136 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 136 elseif CHANNEL == "cucc" then
137 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 137 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
138 else 138 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
139 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 139 else
140 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 140 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
141 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
142 end
141 end 143 end
144 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
142 end 145 end
143 return; 146 return;
144 else 147 else
......
...@@ -117,16 +117,19 @@ function GameStartView:onStart() ...@@ -117,16 +117,19 @@ function GameStartView:onStart()
117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
118 paySuccessFun(); 118 paySuccessFun();
119 else 119 else
120 if CHANNEL=="shdx" then 120 local function okFun()
121 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 121 if CHANNEL == "shdx" then
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 122 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
123 elseif CHANNEL=="cucc" then 123 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
124 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 124 elseif CHANNEL == "cucc" then
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
126 else 126 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 127 else
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 128 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
130 end
129 end 131 end
132 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
130 end 133 end
131 return; 134 return;
132 else 135 else
......
...@@ -117,16 +117,19 @@ function GameStartView:onStart() ...@@ -117,16 +117,19 @@ function GameStartView:onStart()
117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 117 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
118 paySuccessFun(); 118 paySuccessFun();
119 else 119 else
120 if CHANNEL=="shdx" then 120 local function okFun()
121 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 121 if CHANNEL == "shdx" then
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 122 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
123 elseif CHANNEL=="cucc" then 123 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
124 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 124 elseif CHANNEL == "cucc" then
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
126 else 126 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 127 else
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 128 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
129 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
130 end
129 end 131 end
132 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
130 end 133 end
131 return; 134 return;
132 else 135 else
......
...@@ -169,16 +169,19 @@ function GameStartView:onStart() ...@@ -169,16 +169,19 @@ function GameStartView:onStart()
169 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 169 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
170 paySuccessFun(); 170 paySuccessFun();
171 else 171 else
172 if CHANNEL=="shdx" then 172 local function okFun()
173 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 173 if CHANNEL == "shdx" then
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
175 elseif CHANNEL=="cucc" then 175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
176 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 176 elseif CHANNEL == "cucc" then
177 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
178 else 178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
179 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 179 else
180 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
182 end
181 end 183 end
184 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
182 end 185 end
183 return; 186 return;
184 else 187 else
......
...@@ -170,16 +170,19 @@ function GameStartView:onStart() ...@@ -170,16 +170,19 @@ function GameStartView:onStart()
170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 170 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
171 paySuccessFun(); 171 paySuccessFun();
172 else 172 else
173 if CHANNEL=="shdx" then 173 local function okFun()
174 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 174 if CHANNEL == "shdx" then
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 175 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
176 elseif CHANNEL=="cucc" then 176 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
177 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 177 elseif CHANNEL == "cucc" then
178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 178 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
179 else 179 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
180 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 180 else
181 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 181 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
182 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
183 end
182 end 184 end
185 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
183 end 186 end
184 return; 187 return;
185 else 188 else
......
...@@ -6,12 +6,14 @@ function PetPkScene:ctor(params) ...@@ -6,12 +6,14 @@ function PetPkScene:ctor(params)
6 end 6 end
7 7
8 function PetPkScene:onCreate(params) 8 function PetPkScene:onCreate(params)
9 ItemManager.lock_pop = false; --恢复弹窗
9 --GameConfig.pk_num; --每日PK次数上限 10 --GameConfig.pk_num; --每日PK次数上限
10 --GameConfig.pk_num_vip; --每日VIP，pk次数上限 11 --GameConfig.pk_num_vip; --每日VIP，pk次数上限
11 --UserModel.user_info.pk_daily_cnt; --今日已pk次数 12 --UserModel.user_info.pk_daily_cnt; --今日已pk次数
12 local left_vip_day = UserModel.getLeftVipDay(); 13 local left_vip_day = UserModel.getLeftVipDay();
13 if left_vip_day > 0 then 14 if left_vip_day > 0 or MEMBER_TYPE~=0 then
14 GameConfig.pk_num_vip=GameConfig.pk_num_vip-1; 15 --GameConfig.pk_num_vip=GameConfig.pk_num_vip-1; --会员无限次
16 GameConfig.pk_num_vip=9000000;
15 else 17 else
16 GameConfig.pk_num=GameConfig.pk_num-1; 18 GameConfig.pk_num=GameConfig.pk_num-1;
17 end 19 end
......
1 local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb",import("..view.BaseViewNew")); 1 local GameStartView = dialog.uinode("ui/shuyishu/GameStartLayer.csb", import("..view.BaseViewNew"));
2 2
3 local game_data = require("app/views/shuyishu/game_data"); 3 local game_data = require("app/views/shuyishu/game_data");
4 4
5 local ox,oy = 1050,128; 5 local ox, oy = 1050, 128;
6 function GameStartView:ctor() 6 function GameStartView:ctor()
7 GameStartView.super.ctor(self); 7 GameStartView.super.ctor(self);
8 end 8 end
...@@ -20,16 +20,16 @@ function GameStartView:show(onStartFn) ...@@ -20,16 +20,16 @@ function GameStartView:show(onStartFn)
20 end 20 end
21 21
22 function GameStartView:init() 22 function GameStartView:init()
23 self:setContentSize(cc.size(display.width,display.height)); 23 self:setContentSize(cc.size(display.width, display.height));
24 ccui.Helper:doLayout(self); 24 ccui.Helper:doLayout(self);
25 25
26 local btn_start = self:getChildByName("btn_start"); 26 local btn_start = self:getChildByName("btn_start");
27 btn_start.fn = handler(self,self.onStart); 27 btn_start.fn = handler(self, self.onStart);
28 btn_start:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_start.fn)end); 28 btn_start:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_start.fn) end);
29 29
30 local btn_introduce = self:getChildByName("btn_introduce"); 30 local btn_introduce = self:getChildByName("btn_introduce");
31 btn_introduce.fn = handler(self,self.onIntroduce); 31 btn_introduce.fn = handler(self, self.onIntroduce);
32 btn_introduce:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, btn_introduce.fn)end); 32 btn_introduce:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_introduce.fn) end);
33 33
34 self.bg_mask = self:getChildByName("bg_mask"); 34 self.bg_mask = self:getChildByName("bg_mask");
35 self.bg_mask:hide(); 35 self.bg_mask:hide();
...@@ -37,11 +37,11 @@ function GameStartView:init() ...@@ -37,11 +37,11 @@ function GameStartView:init()
37 self.game_introduce:setLocalZOrder(100); 37 self.game_introduce:setLocalZOrder(100);
38 self.game_introduce:hide(); 38 self.game_introduce:hide();
39 39
40 self.nodes[1] = {btn_start,btn_introduce}; 40 self.nodes[1] = { btn_start, btn_introduce };
41 self:updateSelectedState(btn_start); 41 self:updateSelectedState(btn_start);
42 42
43 if IS_XHX then 43 if IS_XHX then
44 btn_introduce:setPosition(cc.p(80,display.height-80)); 44 btn_introduce:setPosition(cc.p(80, display.height - 80));
45 self:initRankView(); 45 self:initRankView();
46 end 46 end
47 end 47 end
...@@ -49,43 +49,43 @@ end ...@@ -49,43 +49,43 @@ end
49 function GameStartView:initRankView() 49 function GameStartView:initRankView()
50 self.rankView = cc.CSLoader:createNode("ui/xyx/XyxRankLayer.csb"); 50 self.rankView = cc.CSLoader:createNode("ui/xyx/XyxRankLayer.csb");
51 local rect = self.rankView:getContentSize(); 51 local rect = self.rankView:getContentSize();
52 self.rankView:setPosition(cc.p(display.width-rect.width-20,20)); 52 self.rankView:setPosition(cc.p(display.width - rect.width - 20, 20));
53 self:addChild(self.rankView); 53 self:addChild(self.rankView);
54 54
55 for i=1,8 do 55 for i = 1, 8 do
56 self.rankView:getChildByName("item_"..i):setVisible(false); 56 self.rankView:getChildByName("item_" .. i):setVisible(false);
57 end 57 end
58 58
59 self.onRankResFun = handler(self,self.onRankRes); 59 self.onRankResFun = handler(self, self.onRankRes);
60 cmsg.on("gateway_msg.single_game_rank_msg_res",self.onRankResFun); 60 cmsg.on("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
61 SocketClient:getInstance():send("gateway_msg.single_game_rank_msg",{id = EnumGame.SHUYISHU}); 61 SocketClient:getInstance():send("gateway_msg.single_game_rank_msg", { id = EnumGame.SHUYISHU });
62 end 62 end
63 63
64 function GameStartView:onRankRes(params) 64 function GameStartView:onRankRes(params)
65 cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun); 65 cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
66 self.rank_list = params.data.game_rank.rank_user; 66 self.rank_list = params.data.game_rank.rank_user;
67 for i=1,8 do 67 for i = 1, 8 do
68 local item = self.rankView:getChildByName("item_"..i); 68 local item = self.rankView:getChildByName("item_" .. i);
69 if self.rank_list[i] then 69 if self.rank_list[i] then
70 item:setVisible(true); 70 item:setVisible(true);
71 if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then 71 if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then
72 item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick,12).."..."); 72 item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick, 12) .. "...");
73 else 73 else
74 item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick); 74 item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick);
75 end 75 end
76 if i > 3 then 76 if i > 3 then
77 item:getChildByName("txt"):setColor(cc.c3b(255,165,0)); 77 item:getChildByName("txt"):setColor(cc.c3b(255, 165, 0));
78 item:getChildByName("txt_score"):setColor(cc.c3b(255,165,0)); 78 item:getChildByName("txt_score"):setColor(cc.c3b(255, 165, 0));
79 end 79 end
80 item:getChildByName("txt_score"):setString(self.rank_list[i].val); 80 item:getChildByName("txt_score"):setString(self.rank_list[i].val);
81 81
82 local btn = item:getChildByName("btn"); 82 local btn = item:getChildByName("btn");
83 btn.user_show = self.rank_list[i].user_show; 83 btn.user_show = self.rank_list[i].user_show;
84 btn.fn = function () 84 btn.fn = function()
85 self:onOpenUserInfo(btn); 85 self:onOpenUserInfo(btn);
86 end; 86 end;
87 btn:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onOpenUserInfo))end); 87 btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onOpenUserInfo)) end);
88 self.nodes[1][#self.nodes[1]+1] = btn; 88 self.nodes[1][#self.nodes[1] + 1] = btn;
89 else 89 else
90 item:setVisible(false); 90 item:setVisible(false);
91 end 91 end
...@@ -99,26 +99,26 @@ function GameStartView:onOpenUserInfo(ref) ...@@ -99,26 +99,26 @@ function GameStartView:onOpenUserInfo(ref)
99 end 99 end
100 100
101 function GameStartView:move() 101 function GameStartView:move()
102 if self.moveIndex <= #self.path and self.moveIndex >=1 then 102 if self.moveIndex <= #self.path and self.moveIndex >= 1 then
103 local nextPoint = self.path[self.moveIndex]; 103 local nextPoint = self.path[self.moveIndex];
104 104
105 self.star:setPosition(nextPoint.x+ox,-nextPoint.y+oy); 105 self.star:setPosition(nextPoint.x + ox, - nextPoint.y + oy);
106 self.moveIndex = self.moveIndex + 1; 106 self.moveIndex = self.moveIndex + 1;
107 else 107 else
108 self:stopAction(self.repeatForver); 108 self:stopAction(self.repeatForver);
109 self.repeatForver = nil; 109 self.repeatForver = nil;
110 110
111 self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5),cc.CallFunc:create(function() 111 self:runAction(cc.Sequence:create(cc.DelayTime:create(0.5), cc.CallFunc:create( function()
112 self.star:setPosition(cc.p(ox,oy)); 112 self.star:setPosition(cc.p(ox, oy));
113 self.star:hide(); 113 self.star:hide();
114 end))); 114 end )));
115 115
116 self:runAction(cc.Sequence:create(cc.DelayTime:create(3),cc.CallFunc:create(function() 116 self:runAction(cc.Sequence:create(cc.DelayTime:create(3), cc.CallFunc:create( function()
117 self.star:show(); 117 self.star:show();
118 self.moveIndex = 1; 118 self.moveIndex = 1;
119 self.repeatForver = schedule(self,handler(self,self.move),0); 119 self.repeatForver = schedule(self, handler(self, self.move), 0);
120 SoundManager.playEffect("res/ui/shuyishu/magic.mp3"); 120 SoundManager.playEffect("res/ui/shuyishu/magic.mp3");
121 end))); 121 end )));
122 end 122 end
123 end 123 end
124 124
...@@ -130,52 +130,56 @@ function GameStartView:onStart() ...@@ -130,52 +130,56 @@ function GameStartView:onStart()
130 self:close(); 130 self:close();
131 end 131 end
132 132
133 GAME_ID=EnumGame.SHUYISHU; 133 GAME_ID = EnumGame.SHUYISHU;
134 if IS_XHX then 134 if IS_XHX then
135 local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU); 135 local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU);
136 print("打开小游戏：",game_info.id); 136 print("打开小游戏：", game_info.id);
137 if UserModel.getLeftVipDay() == 0 then 137 if UserModel.getLeftVipDay() == 0 then
138 print("小游戏购买界面"); 138 print("小游戏购买界面");
139 local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完 139 local free_every_day_num = UserModel.getSingleGameById(game_info.id);
140 if free_every_day_num.val1==0 then 140 -- 今天的免费次数是否用完
141 if free_every_day_num.val1 == 0 then
141 logUI("每天免费玩一次"); 142 logUI("每天免费玩一次");
142 local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 }; 143 local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
143 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 144 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
144 paySuccessFun(); 145 paySuccessFun();
145 else 146 else
146 if CHANNEL=="shdx" then 147 local function okFun()
147 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 148 if CHANNEL == "shdx" then
148 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 149 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
149 elseif CHANNEL=="cucc" then 150 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
150 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 151 elseif CHANNEL == "cucc" then
151 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 152 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id, paySuccessFun);
152 else 153 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
153 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 154 else
154 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 155 local reciever = require("app.views.view.XyxPayView"):show(game_info.id, paySuccessFun);
156 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
157 end
155 end 158 end
159 Alert.showTwo("今日试用次数已用完，是否立即开通会员畅享游乐园？", okFun);
156 end 160 end
157 return; 161 return;
158 else 162 else
159 paySuccessFun(); 163 paySuccessFun();
160 end 164 end
161 elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then 165 elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
162 local reciever = require("app.views.shuyishu.GamePayView"):show("",paySuccessFun); 166 local reciever = require("app.views.shuyishu.GamePayView"):show("", paySuccessFun);
163 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 167 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
164 elseif CHANNEL == "ws" then 168 elseif CHANNEL == "ws" then
165 local unlock_price = 9.9; 169 local unlock_price = 9.9;
166 local function onPaySuccessCallBack(result) 170 local function onPaySuccessCallBack(result)
167 if result == "success" then 171 if result == "success" then
168 UmengHelper.pay(unlock_price.."&1"); 172 UmengHelper.pay(unlock_price .. "&1");
169 game_data.set_is_vip(1); 173 game_data.set_is_vip(1);
170 self:onStart(); 174 self:onStart();
171 end 175 end
172 end 176 end
173 local function okPayFun() 177 local function okPayFun()
174 UmengHelper.onEvent("unlock_click"); 178 UmengHelper.onEvent("unlock_click");
175 ShopModel.pay("tjlhxkgxyx_unlock","永久解锁",unlock_price,onPaySuccessCallBack,timeoutCallBack); 179 ShopModel.pay("tjlhxkgxyx_unlock", "永久解锁", unlock_price, onPaySuccessCallBack, timeoutCallBack);
176 end 180 end
177 if game_data.get_is_vip() == 0 and game_data.get_game_play_cnt() >= 3 then 181 if game_data.get_is_vip() == 0 and game_data.get_game_play_cnt() >= 3 then
178 local receiver = require("app.views.view.AlertView"):show({msg="您的免费试玩已结束，是否花"..unlock_price.."元付费解锁？"},okPayFun,nil,1); 182 local receiver = require("app.views.view.AlertView"):show( { msg = "您的免费试玩已结束，是否花" .. unlock_price .. "元付费解锁？" }, okPayFun, nil, 1);
179 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver); 183 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
180 return; 184 return;
181 else 185 else
...@@ -198,27 +202,27 @@ end ...@@ -198,27 +202,27 @@ end
198 202
199 function GameStartView:close() 203 function GameStartView:close()
200 if IS_XHX then 204 if IS_XHX then
201 cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun); 205 cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
202 end 206 end
203 GameStartView.super.close(self); 207 GameStartView.super.close(self);
204 end 208 end
205 209
206 --返回键处理函数 210 -- 返回键处理函数
207 function GameStartView:onKeypadBack() 211 function GameStartView:onKeypadBack()
208 if not IS_XHX then 212 if not IS_XHX then
209 local function okFun() 213 local function okFun()
210 cc.Director:getInstance():endToLua(); 214 cc.Director:getInstance():endToLua();
211 end 215 end
212 216
213 local receiver = require("app.views.view.AlertView"):show({msg="确定要退出游戏？"},okFun,cancelFun,2); 217 local receiver = require("app.views.view.AlertView"):show( { msg = "确定要退出游戏？" }, okFun, cancelFun, 2);
214 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver); 218 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
215 else 219 else
216 cmsg.off("gateway_msg.single_game_rank_msg_res",self.onRankResFun); 220 cmsg.off("gateway_msg.single_game_rank_msg_res", self.onRankResFun);
217 app:enterScene("LoadingScene",{nextSceneName="MainScene",class_name="app.views.view.XyxView"}); 221 app:enterScene("LoadingScene", { nextSceneName = "MainScene", class_name = "app.views.view.XyxView" });
218 end 222 end
219 end 223 end
220 224
221 --隐藏按键 225 -- 隐藏按键
222 function GameStartView:onKeypadSecrect() 226 function GameStartView:onKeypadSecrect()
223 if not self.game_introduce:isVisible() then 227 if not self.game_introduce:isVisible() then
224 return; 228 return;
...@@ -227,7 +231,7 @@ function GameStartView:onKeypadSecrect() ...@@ -227,7 +231,7 @@ function GameStartView:onKeypadSecrect()
227 clearLogUI(); 231 clearLogUI();
228 if DEBUG == 0 then 232 if DEBUG == 0 then
229 DEBUG = 1; 233 DEBUG = 1;
230 234
231 logUI("进入调试模式："); 235 logUI("进入调试模式：");
232 if CHANNEL == "shdx" then 236 if CHANNEL == "shdx" then
233 self.auto_pay_index = 0; 237 self.auto_pay_index = 0;
...@@ -253,17 +257,23 @@ function GameStartView:autoPay() ...@@ -253,17 +257,23 @@ function GameStartView:autoPay()
253 self.auto_pay_index = 0; 257 self.auto_pay_index = 0;
254 clearLogUI(); 258 clearLogUI();
255 end 259 end
256 local tradeNo = tostring(os.time())..math.random(10000,99999); --订单号 260 local tradeNo = tostring(os.time()) .. math.random(10000, 99999);
257 local productId = PAY_ID_SHDX; --商品ID 261 -- 订单号
258 local subject = PAY_PRICE_SHDX.."元体验游戏"; --商品名称 262 local productId = PAY_ID_SHDX;
259 local amount = PAY_PRICE_SHDX; --商品价格 263 -- 商品ID
260 local notificationURL = "http://www.baidu.com";--回调URL 264 local subject = PAY_PRICE_SHDX .. "元体验游戏";
261 local peng_bo_shi_token = "123";--鹏博士密钥 265 -- 商品名称
266 local amount = PAY_PRICE_SHDX;
267 -- 商品价格
268 local notificationURL = "http://www.baidu.com";
269 -- 回调URL
270 local peng_bo_shi_token = "123";
271 -- 鹏博士密钥
262 272
263 local function callbackLua(params) 273 local function callbackLua(params)
264 if params == "success" then 274 if params == "success" then
265 if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then 275 if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
266 HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=102,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX}); 276 HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 102, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
267 end 277 end
268 logUI("...*"); 278 logUI("...*");
269 else 279 else
...@@ -272,24 +282,24 @@ function GameStartView:autoPay() ...@@ -272,24 +282,24 @@ function GameStartView:autoPay()
272 end 282 end
273 283
274 local function payCallbackFromJava(params) 284 local function payCallbackFromJava(params)
275 delayCall(0.5,function() 285 delayCall(0.5, function()
276 callbackLua(params); 286 callbackLua(params);
277 end); 287 end );
278 end 288 end
279 289
280 logUI("..."); 290 logUI("...");
281 local pay_params = tradeNo..","..productId..","..subject..","..amount..","..notificationURL..","..peng_bo_shi_token; 291 local pay_params = tradeNo .. "," .. productId .. "," .. subject .. "," .. amount .. "," .. notificationURL .. "," .. peng_bo_shi_token;
282 DeviceUtil.sendBilling(pay_params,payCallbackFromJava); 292 DeviceUtil.sendBilling(pay_params, payCallbackFromJava);
283 if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then 293 if cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
284 HttpRequest:getInstance():post("http://139.196.55.173:22999/st",{id=101,gameid=GAME_ID,channel=CHANNEL,account=DeviceUtil.getDeviceId(),price=PAY_PRICE_SHDX}); 294 HttpRequest:getInstance():post("http://139.196.55.173:22999/st", { id = 101, gameid = GAME_ID, channel = CHANNEL, account = DeviceUtil.getDeviceId(), price = PAY_PRICE_SHDX });
285 end 295 end
286 296
287 self.auto_pay_index = self.auto_pay_index + 1; 297 self.auto_pay_index = self.auto_pay_index + 1;
288 298
289 math.randomseed(tostring(os.time()+self.auto_pay_index):reverse():sub(1,6)); 299 math.randomseed(tostring(os.time() + self.auto_pay_index):reverse():sub(1, 6));
290 self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532,1196)*0.01),cc.CallFunc:create(function() 300 self.auto_pay_action = self:runAction(cc.Sequence:create(cc.DelayTime:create(math.random(532, 1196) * 0.01), cc.CallFunc:create( function()
291 self:autoPay(); 301 self:autoPay();
292 end))); 302 end )));
293 end 303 end
294 304
295 return GameStartView 305 return GameStartView
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -127,6 +127,9 @@ function AchievementView:updateItems() ...@@ -127,6 +127,9 @@ function AchievementView:updateItems()
127 if _list[i] and _list[i].viewid==5 then 127 if _list[i] and _list[i].viewid==5 then
128 table.remove(_list,i); 128 table.remove(_list,i);
129 end 129 end
130 if _list[i] and _list[i].viewid==11 then
131 table.remove(_list,i);
132 end
130 end 133 end
131 end 134 end
132 135
...@@ -351,6 +354,9 @@ function AchievementView:setScrollPosition(node) ...@@ -351,6 +354,9 @@ function AchievementView:setScrollPosition(node)
351 if _list[i] and _list[i].viewid==5 then 354 if _list[i] and _list[i].viewid==5 then
352 table.remove(_list,i); 355 table.remove(_list,i);
353 end 356 end
357 if _list[i] and _list[i].viewid==11 then
358 table.remove(_list,i);
359 end
354 end 360 end
355 end 361 end
356 362
......
1 --活动，小游戏周赛 1 -- 活动，小游戏周赛
2 local ActivityMatchView = dialog.uinode("ui/Activity/ActivityMatchLayer.csb",import(".BaseView")) 2 local ActivityMatchView = dialog.uinode("ui/Activity/ActivityMatchLayer.csb", import(".BaseView"))
3 3
4 function ActivityMatchView:ctor(id,_update_nodes_func) 4 function ActivityMatchView:ctor(id, _update_nodes_func)
5 self.id = id; 5 self.id = id;
6 self.update_nodes_func = _update_nodes_func; 6 self.update_nodes_func = _update_nodes_func;
7 self.info = RankExprieRewardInfo.getInfoByID(self.id); --根据id获取周排行信息 7 self.info = RankExprieRewardInfo.getInfoByID(self.id);
8 -- 根据id获取周排行信息
8 self.my_rank = 0; 9 self.my_rank = 0;
9 ActivityMatchView.super.ctor(self); 10 ActivityMatchView.super.ctor(self);
10 end 11 end
11 12
12 function ActivityMatchView:init() 13 function ActivityMatchView:init()
13 self.nodes = {}; 14 self.nodes = { };
14 15
15 self:getChildByName("bg_match_8"):setVisible(false); --旋转海盗 16 self:getChildByName("bg_match_8"):setVisible(false);
16 self:getChildByName("bg_match_9"):setVisible(false); --飞檐走壁 17 -- 旋转海盗
17 self:getChildByName("bg_match_5"):setVisible(false); --接糖果 18 self:getChildByName("bg_match_9"):setVisible(false);
18 self:getChildByName("bg_match_7"):setVisible(false); --奔跑吧小兔子 19 -- 飞檐走壁
19 self:getChildByName("bg_match_3"):setVisible(false); --猜猜我是谁 20 self:getChildByName("bg_match_5"):setVisible(false);
20 21 -- 接糖果
21 if CHANNEL=="shdx" then 22 self:getChildByName("bg_match_7"):setVisible(false);
23 -- 奔跑吧小兔子
24 self:getChildByName("bg_match_3"):setVisible(false);
25 -- 猜猜我是谁
26
27 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()); 28 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()); 29 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()); 30 self:getChildByName("bg_match_7"):getChildByName("pic"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/rabbit_shdx.png"):getSpriteFrame());
...@@ -28,29 +34,29 @@ function ActivityMatchView:init() ...@@ -28,29 +34,29 @@ function ActivityMatchView:init()
28 self.rankView = self:getChildByName("rankView"); 34 self.rankView = self:getChildByName("rankView");
29 35
30 self.btn_start_game = self:getChildByName("btn_start_game"); 36 self.btn_start_game = self:getChildByName("btn_start_game");
31 self.btn_start_game.fn = function () 37 self.btn_start_game.fn = function()
32 self:onStartGameClick(self.btn_start_game); 38 self:onStartGameClick(self.btn_start_game);
33 end 39 end
34 self.btn_start_game:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onStartGameClick))end); 40 self.btn_start_game:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onStartGameClick)) end);
35 41
36 self.btn_lingqu = self:getChildByName("btn_lingqu"); 42 self.btn_lingqu = self:getChildByName("btn_lingqu");
37 self.btn_lingqu.fn = function () 43 self.btn_lingqu.fn = function()
38 self:onLingquClick(self.btn_lingqu); 44 self:onLingquClick(self.btn_lingqu);
39 end 45 end
40 self.btn_lingqu:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onLingquClick))end); 46 self.btn_lingqu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onLingquClick)) end);
41 self.yilingqu = self:getChildByName("yilingqu"); 47 self.yilingqu = self:getChildByName("yilingqu");
42 self.yilingqu:setVisible(false); 48 self.yilingqu:setVisible(false);
43 49
44 self.btn_reward = self:getChildByName("btn_reward"); 50 self.btn_reward = self:getChildByName("btn_reward");
45 self.btn_reward.fn = function () 51 self.btn_reward.fn = function()
46 self:onRewardClick(self.btn_reward); 52 self:onRewardClick(self.btn_reward);
47 end 53 end
48 self.btn_reward:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onRewardClick))end); 54 self.btn_reward:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onRewardClick)) end);
49 55
50 self:update(); 56 self:update();
51 57
52 self.get_reward = 0; 58 self.get_reward = 0;
53 EventListener.addEventListener(self,EnumEvent.ACT_MATCH_RANK_RES,handler(self,self.onActMatchRankRes)); 59 EventListener.addEventListener(self, EnumEvent.ACT_MATCH_RANK_RES, handler(self, self.onActMatchRankRes));
54 ActivityModel.getMatchRankMsg(self.id); 60 ActivityModel.getMatchRankMsg(self.id);
55 61
56 return self.nodes; 62 return self.nodes;
...@@ -62,18 +68,18 @@ function ActivityMatchView:onActMatchRankRes(eve) ...@@ -62,18 +68,18 @@ function ActivityMatchView:onActMatchRankRes(eve)
62 self.get_reward = eve.data.get_reward; 68 self.get_reward = eve.data.get_reward;
63 69
64 if UserModel.time_second < self.info.end_time then 70 if UserModel.time_second < self.info.end_time then
65 self.nodes[1] = {self.btn_start_game,self.btn_reward}; 71 self.nodes[1] = { self.btn_start_game, self.btn_reward };
66 self.btn_lingqu:setVisible(false); 72 self.btn_lingqu:setVisible(false);
67 else 73 else
68 74
69 self.btn_start_game:setVisible(false); 75 self.btn_start_game:setVisible(false);
70 76
71 if self.get_reward == 1 then 77 if self.get_reward == 1 then
72 self.btn_lingqu:setVisible(false); 78 self.btn_lingqu:setVisible(false);
73 self.yilingqu:setVisible(true); 79 self.yilingqu:setVisible(true);
74 self.nodes[1] = {self.btn_reward}; 80 self.nodes[1] = { self.btn_reward };
75 else 81 else
76 self.nodes[1] = {self.btn_lingqu,self.btn_reward}; 82 self.nodes[1] = { self.btn_lingqu, self.btn_reward };
77 end 83 end
78 end 84 end
79 if self.update_nodes_func then 85 if self.update_nodes_func then
...@@ -83,44 +89,44 @@ function ActivityMatchView:onActMatchRankRes(eve) ...@@ -83,44 +89,44 @@ function ActivityMatchView:onActMatchRankRes(eve)
83 end 89 end
84 90
85 function ActivityMatchView:update(id) 91 function ActivityMatchView:update(id)
86 --local startDayDate = os.date("*t",self.info.start_time); 92 -- local startDayDate = os.date("*t",self.info.start_time);
87 --local endDayDate = os.date("*t",self.info.end_time); 93 -- local endDayDate = os.date("*t",self.info.end_time);
88 --self:getChildByName("txt_time"):setString(startDayDate.month.."月"..startDayDate.day.."日-"..endDayDate.month.."月"..endDayDate.day.."日"); 94 -- self:getChildByName("txt_time"):setString(startDayDate.month.."月"..startDayDate.day.."日-"..endDayDate.month.."月"..endDayDate.day.."日");
89 --修改为排名场次文字，不在使用日期显示 95 -- 修改为排名场次文字，不在使用日期显示
90 --self:getChildByName("bg"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_"..self.info.gameid..".png"):getSpriteFrame()); 96 -- self:getChildByName("bg"):setSpriteFrame(cc.Sprite:create("res/ui/Activity/match/bg_match_"..self.info.gameid..".png"):getSpriteFrame());
91 self:getChildByName("bg_match_"..self.info.gameid):setVisible(true); 97 self:getChildByName("bg_match_" .. self.info.gameid):setVisible(true);
92 end 98 end
93 99
94 function ActivityMatchView:updateRankView() 100 function ActivityMatchView:updateRankView()
95 for i=1,8 do 101 for i = 1, 8 do
96 local item = self.rankView:getChildByName("item_"..i); 102 local item = self.rankView:getChildByName("item_" .. i);
97 if self.rank_list[i] then 103 if self.rank_list[i] then
98 item:setVisible(true); 104 item:setVisible(true);
99 if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then 105 if StringUtil.GetUTFLen(self.rank_list[i].user_show.nick) >= 16 then
100 item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick,12).."..."); 106 item:getChildByName("txt"):setString(StringUtil.getMaxLenString(self.rank_list[i].user_show.nick, 12) .. "...");
101 else 107 else
102 item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick); 108 item:getChildByName("txt"):setString(self.rank_list[i].user_show.nick);
103 end 109 end
104 if i > 3 then 110 if i > 3 then
105 item:getChildByName("txt"):setColor(cc.c3b(255,165,0)); 111 item:getChildByName("txt"):setColor(cc.c3b(255, 165, 0));
106 item:getChildByName("txt_score"):setColor(cc.c3b(255,165,0)); 112 item:getChildByName("txt_score"):setColor(cc.c3b(255, 165, 0));
107 end 113 end
108 item:getChildByName("txt_score"):setString(self.rank_list[i].val); 114 item:getChildByName("txt_score"):setString(self.rank_list[i].val);
109 115
110 local btn = item:getChildByName("btn"); 116 local btn = item:getChildByName("btn");
111 btn.user_show = self.rank_list[i].user_show; 117 btn.user_show = self.rank_list[i].user_show;
112 btn.fn = function () 118 btn.fn = function()
113 self:onOpenUserInfo(btn); 119 self:onOpenUserInfo(btn);
114 end; 120 end;
115 btn:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onOpenUserInfo))end); 121 btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onOpenUserInfo)) end);
116 self.nodes[1][#self.nodes[1]+1] = btn; 122 self.nodes[1][#self.nodes[1] + 1] = btn;
117 else 123 else
118 item:setVisible(false); 124 item:setVisible(false);
119 end 125 end
120 end 126 end
121 127
122 self.my_rank = 0; 128 self.my_rank = 0;
123 for i,v in ipairs(self.rank_list) do 129 for i, v in ipairs(self.rank_list) do
124 if v.user_show.uid == UserModel.user_info.uid then 130 if v.user_show.uid == UserModel.user_info.uid then
125 self.my_rank = i; 131 self.my_rank = i;
126 break; 132 break;
...@@ -129,9 +135,9 @@ function ActivityMatchView:updateRankView() ...@@ -129,9 +135,9 @@ function ActivityMatchView:updateRankView()
129 if self.my_rank == 0 then 135 if self.my_rank == 0 then
130 self:getChildByName("txt_rank"):setString("我的排名：未上榜"); 136 self:getChildByName("txt_rank"):setString("我的排名：未上榜");
131 else 137 else
132 self:getChildByName("txt_rank"):setString("我的排名："..self.my_rank); 138 self:getChildByName("txt_rank"):setString("我的排名：" .. self.my_rank);
133 end 139 end
134 self:getChildByName("txt_cnt"):setString("参与场次："..self.my_cnt); 140 self:getChildByName("txt_cnt"):setString("参与场次：" .. self.my_cnt);
135 end 141 end
136 142
137 function ActivityMatchView:onOpenUserInfo(ref) 143 function ActivityMatchView:onOpenUserInfo(ref)
...@@ -143,34 +149,45 @@ end ...@@ -143,34 +149,45 @@ end
143 function ActivityMatchView:onStartGameClick(ref) 149 function ActivityMatchView:onStartGameClick(ref)
144 app:enterMiniGame(self.info.gameid); 150 app:enterMiniGame(self.info.gameid);
145 151
146 -- if self.info.gameid == EnumGame.CAKE then 152 -- if self.info.gameid == EnumGame.CAKE then
147 -- app:enterMiniGameScene("cake.LoadingScene"); 153 -- app:enterMiniGameScene("cake.LoadingScene");
148 -- elseif self.info.gameid == EnumGame.FANPAI then 154 -- elseif self.info.gameid == EnumGame.FANPAI then
149 -- app:enterMiniGameScene("fanpai.LoadingScene"); 155 -- app:enterMiniGameScene("fanpai.LoadingScene");
150 -- elseif self.info.gameid == EnumGame.GUESS then 156 -- elseif self.info.gameid == EnumGame.GUESS then
151 -- app:enterMiniGameScene("guess.LoadingScene"); 157 -- app:enterMiniGameScene("guess.LoadingScene");
152 -- elseif self.info.gameid == EnumGame.GUESS_COLOR then 158 -- elseif self.info.gameid == EnumGame.GUESS_COLOR then
153 -- app:enterMiniGameScene("guesscolor.LoadingScene"); 159 -- app:enterMiniGameScene("guesscolor.LoadingScene");
154 -- elseif self.info.gameid == EnumGame.CANDY then 160 -- elseif self.info.gameid == EnumGame.CANDY then
155 -- app:enterMiniGameScene("candy.LoadingScene"); 161 -- app:enterMiniGameScene("candy.LoadingScene");
156 -- elseif self.info.gameid == EnumGame.SHUYISHU then 162 -- elseif self.info.gameid == EnumGame.SHUYISHU then
157 -- app:enterMiniGameScene("shuyishu.LoadingScene"); 163 -- app:enterMiniGameScene("shuyishu.LoadingScene");
158 -- elseif self.info.gameid == EnumGame.RABBIT then 164 -- elseif self.info.gameid == EnumGame.RABBIT then
159 -- app:enterMiniGameScene("run.LoadingScene"); 165 -- app:enterMiniGameScene("run.LoadingScene");
160 -- elseif self.info.gameid == EnumGame.HAIDAO then 166 -- elseif self.info.gameid == EnumGame.HAIDAO then
161 -- app:enterMiniGameScene("haidao.LoadingScene"); 167 -- app:enterMiniGameScene("haidao.LoadingScene");
162 -- elseif self.info.gameid == EnumGame.FEIYANZOUBI then 168 -- elseif self.info.gameid == EnumGame.FEIYANZOUBI then
163 -- app:enterMiniGameScene("feiyanzoubi.LoadingScene"); 169 -- app:enterMiniGameScene("feiyanzoubi.LoadingScene");
164 -- elseif self.info.gameid == EnumGame.BIRD then 170 -- elseif self.info.gameid == EnumGame.BIRD then
165 -- app:enterMiniGameScene("bird.LoadingScene"); 171 -- app:enterMiniGameScene("bird.LoadingScene");
166 -- end 172 -- end
167 end 173 end
168 174
169 function ActivityMatchView:onLingquClick(ref) 175 function ActivityMatchView:onLingquClick(ref)
170 if self.get_reward == 0 then 176 if self.get_reward == 0 then
171 SocketClient:getInstance():send("gateway_msg.single_exprie_game_rank_reward_msg",{id = self.info.id}); 177 local list = self.info.list;
172 local receiver = require("app.views.view.ActivityMatchLingquView"):show(self.info,self.my_rank,self.my_cnt); 178 local flag=false;
173 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver); 179 for i = 1, 4 do
180 if self.my_rank >= list[i].noBegin and self.my_rank <= list[i].noEnd then
181 SocketClient:getInstance():send("gateway_msg.single_exprie_game_rank_reward_msg", { id = self.info.id });
182 local receiver = require("app.views.view.ActivityMatchLingquView"):show(self.info, self.my_rank, self.my_cnt);
183 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(receiver);
184 else
185 flag=true;
186 end
187 end
188 if flag then
189 Alert.showOne("上周没有可领取的排行榜奖励");
190 end
174 else 191 else
175 Alert.showOne("奖励已领取"); 192 Alert.showOne("奖励已领取");
176 end 193 end
......
...@@ -52,12 +52,6 @@ function ActivityVipView:init() ...@@ -52,12 +52,6 @@ function ActivityVipView:init()
52 52
53 UmengHelper.onEvent("activity_vip_show"); 53 UmengHelper.onEvent("activity_vip_show");
54 54
55 self.yilingqu_month:setVisible(false);
56 self.yilingqu_year:setVisible(false);
57 self.btn_lingqu_month:setVisible(false);
58 self.btn_vip_year:setVisible(false);
59 self.btn_lingqu_year:setVisible(false);
60
61 return self:update(true); 55 return self:update(true);
62 end 56 end
63 57
...@@ -84,14 +78,18 @@ function ActivityVipView:checkVipReward() ...@@ -84,14 +78,18 @@ function ActivityVipView:checkVipReward()
84 end 78 end
85 79
86 function ActivityVipView:update(_is_init) 80 function ActivityVipView:update(_is_init)
81 self.btn_vip_year:setVisible(false);
82 self.btn_vip_lianxu:setVisible(false);
83 self.yilingqu_month:setVisible(false);
84 self.yilingqu_year:setVisible(false);
85 self.btn_lingqu_month:setVisible(false);
86 self.btn_lingqu_year:setVisible(false);
87 local vipList = ShopInfo.getVipList(); 87 local vipList = ShopInfo.getVipList();
88 88
89 local _nodes = { }; 89 local _nodes = { };
90 90
91 -- 包月 91 -- 包月
92 local vipInfo1 = vipList[1]; 92 local vipInfo1 = vipList[1];
93 -- 连续包月
94 local vipInfo3 = vipList[3];
95 93
96 local itemList1 = vipInfo1.itemList; 94 local itemList1 = vipInfo1.itemList;
97 for i = 1, 2 do 95 for i = 1, 2 do
...@@ -114,11 +112,6 @@ function ActivityVipView:update(_is_init) ...@@ -114,11 +112,6 @@ function ActivityVipView:update(_is_init)
114 local data1 = UserModel.getVipByID(vipInfo1.id); 112 local data1 = UserModel.getVipByID(vipInfo1.id);
115 if data1 and data1.val2 >= UserModel.time_second then 113 if data1 and data1.val2 >= UserModel.time_second then
116 has_vip_month = true; 114 has_vip_month = true;
117 elseif vipInfo3 then
118 local data3 = UserModel.getVipByID(vipInfo3.id);
119 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
120 has_vip_month = true;
121 end
122 end 115 end
123 116
124 local data1 = UserModel.getVipByID(vipInfo1.id); 117 local data1 = UserModel.getVipByID(vipInfo1.id);
...@@ -143,45 +136,14 @@ function ActivityVipView:update(_is_init) ...@@ -143,45 +136,14 @@ function ActivityVipView:update(_is_init)
143 self.yilingqu_month:setVisible(true); 136 self.yilingqu_month:setVisible(true);
144 end 137 end
145 elseif not has_vip_month then 138 elseif not has_vip_month then
146 if vipInfo3 then 139 self.btn_vip_lianxu:setVisible(true);
147 -- self.btn_vip_month:setVisible(true); 140 if #_nodes > 0 then
148 -- _nodes[1] = { self.btn_vip_month }; 141 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
149 else 142 else
150 -- self.btn_vip_month_single:setVisible(true); 143 _nodes[1] = { self.btn_vip_lianxu };
151 -- _nodes[1] = { self.btn_vip_month_single };
152 end 144 end
153 end 145 end
154 146
155 if vipInfo3 then
156 local data3 = UserModel.getVipByID(vipInfo3.id);
157 if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
158 if data3.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data3.val1) then
159 -- 可领取
160 self.btn_lingqu_month:setVisible(true);
161 self.btn_lingqu_month.id = vipInfo3.id;
162 -- self.btn_lingqu_month:getChildByName("txt"):setString("永久");
163 _nodes[1] = { self.btn_lingqu_month };
164 else
165 -- 已领取
166 self.btn_lingqu_month:setVisible(false);
167 self.yilingqu_month:setVisible(true);
168 end
169 elseif not has_vip_month then
170 --[[self.btn_vip_lianxu:setVisible(true);
171 if #_nodes > 0 then
172 _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
173 else
174 _nodes[1] = {self.btn_vip_lianxu};
175 end--]]
176 end
177 end
178
179 if #_nodes > 0 then
180 _nodes[1][#_nodes[1] + 1] = self.btn_vip_lianxu;
181 else
182 _nodes[1] = { self.btn_vip_lianxu };
183 end
184
185 -- 包年 147 -- 包年
186 local vipInfo2 = vipList[2]; 148 local vipInfo2 = vipList[2];
187 local itemList2 = vipInfo2.itemList; 149 local itemList2 = vipInfo2.itemList;
......
...@@ -526,9 +526,13 @@ function FriendView:onPkClick(ref) ...@@ -526,9 +526,13 @@ function FriendView:onPkClick(ref)
526 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info; 526 UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
527 paySuccessFun(); 527 paySuccessFun();
528 else 528 else
529 logUI("shdx------------------>");
529 local reciever = nil; 530 local reciever = nil;
530 if CHANNEL=="cucc" then 531 if CHANNEL=="cucc" then
531 reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun); 532 reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
533 elseif CHANNEL=="shdx" then
534 logUI("shdx2222------------------>");
535 reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id, paySuccessFun);
532 else 536 else
533 reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 537 reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
534 end 538 end
......
...@@ -15,9 +15,11 @@ function PetFightView:init(_nodes,_update_nodes_func) ...@@ -15,9 +15,11 @@ function PetFightView:init(_nodes,_update_nodes_func)
15 --UserModel.user_info.pk_daily_cnt; --今日已pk次数 15 --UserModel.user_info.pk_daily_cnt; --今日已pk次数
16 local left_vip_day = UserModel.getLeftVipDay(); 16 local left_vip_day = UserModel.getLeftVipDay();
17 self.remain_value=0; 17 self.remain_value=0;
18 if left_vip_day > 0 then 18 if left_vip_day > 0 or MEMBER_TYPE~=0 then
19 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt; 19 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
20 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt)); 20 --self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt));
21 self:getChildByName("pk_num"):setString("今日剩余次数：无限");
22 self.remain_value=9000000;
21 else 23 else
22 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt; 24 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
23 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt)); 25 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt));
...@@ -162,13 +164,14 @@ function PetFightView:onScoreFightClick() ...@@ -162,13 +164,14 @@ function PetFightView:onScoreFightClick()
162 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id); 164 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id);
163 165
164 if self.remain_value<=0 then 166 if self.remain_value<=0 then
165 Alert.showOne("今日挑战次数已用完\n明天再来哦"); 167 Alert.showOne("成为会员每日无限制pk次数限制");
166 return; 168 return;
167 elseif #team_v.pet_id == 4 then 169 elseif #team_v.pet_id == 4 then
168 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun); 170 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun);
169 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun); 171 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun);
170 172
171 self.notifyGameEndCallbackFun = handler(self,self.onNotifyGameEndCallBackFun); 173 self.notifyGameEndCallbackFun = handler(self,self.onNotifyGameEndCallBackFun);
174 ItemManager.lock_pop = true; --关掉弹窗
172 cmsg.on("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun); 175 cmsg.on("gateway_msg.notify_game_end_msg_res",self.notifyGameEndCallbackFun);
173 176
174 SocketClient:getInstance():send("gateway_msg.lobby_enter_msg",{pet_id = team_v.pet_id}); 177 SocketClient:getInstance():send("gateway_msg.lobby_enter_msg",{pet_id = team_v.pet_id});
......
...@@ -162,8 +162,9 @@ end ...@@ -162,8 +162,9 @@ end
162 function PetPkResultView:onAgain() 162 function PetPkResultView:onAgain()
163 local left_vip_day = UserModel.getLeftVipDay(); 163 local left_vip_day = UserModel.getLeftVipDay();
164 self.remain_value=0; 164 self.remain_value=0;
165 if left_vip_day > 0 then 165 if left_vip_day > 0 or MEMBER_TYPE~=0 then
166 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt; 166 --self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
167 self.remain_value=9000000;
167 else 168 else
168 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt; 169 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
169 end 170 end
...@@ -174,7 +175,7 @@ function PetPkResultView:onAgain() ...@@ -174,7 +175,7 @@ function PetPkResultView:onAgain()
174 end 175 end
175 self:close(); 176 self:close();
176 else 177 else
177 Alert.showOne("今日挑战次数已用完\n明天再来哦"); 178 Alert.showOne("成为会员每日无限制pk次数限制");
178 end 179 end
179 end 180 end
180 181
......
...@@ -28,5 +28,16 @@ ...@@ -28,5 +28,16 @@
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/xyx/XyxRewardLayer.csd" />
35 <FilePathData Path="ui/Activity/ActivityVip.csd" />
36 <FilePathData Path="ui/pet/PetPkScene.csd" />
37 <FilePathData Path="ui/pet/PetFightOptionLayer.csd" />
38 </OpenedDocuments>
39 <ActiveDocument Path="ui/pet/PetFightOptionLayer.csd" />
40 </Value>
41 </Item>
31 </Properties> 42 </Properties>
32 </UserData> 43 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......