Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b2086fc7 b2086fc7165054f336f286fe103864ff3364257c by jinwawa
Options

0530

1 parent 6edf5f05
Expand all
Inline Side-by-side
Showing 58 changed files with 216 additions and 286 deletions
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
7 wxLogin:道具ID,道具数量cnt 7 wxLogin:道具ID,道具数量cnt
8 --> 8 -->
9 <root> 9 <root>
10 <id item="100001,500;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;600001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/> 10 <id item="100001,2000;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;300001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/>
11 </root> 11 </root>
......
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
43 <common id="22" val="20"/> 43 <common id="22" val="20"/>
44 44
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="1000000"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="1500000"/> 48 <common id="24" val="15"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="0"/> 51 <common id="10000" val="0"/>
......
...@@ -2292,7 +2292,7 @@ ...@@ -2292,7 +2292,7 @@
2292 <!-- 自动战斗对手 2292 <!-- 自动战斗对手
2293 --> 2293 -->
2294 2294
2295 <user id="1001" name="对手1001" pk_val="200"> 2295 <user id="1001" name="对手1001" pk_val="500">
2296 <!-- 2296 <!--
2297 id//id 2297 id//id
2298 lv//等级 2298 lv//等级
...@@ -2315,20 +2315,7 @@ ...@@ -2315,20 +2315,7 @@
2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2318 <pet id="10015" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2319 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2318 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2320 <pet id="10017" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2321 <pet id="10018" lv="1" skill_id="4007" ack="2" hp="6" congming="10"/>
2322 <pet id="10019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2323 <pet id="10020" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2324 <pet id="10021" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2325 <pet id="10022" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2326 <pet id="10023" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2327 <pet id="10024" lv="1" skill_id="3001" ack="2" hp="6" congming="10"/>
2328 <pet id="10027" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2329 <pet id="10029" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2330 <pet id="10032" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2331 <pet id="10052" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2332 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2319 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2333 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2320 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2334 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/> 2321 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
...@@ -2344,27 +2331,15 @@ ...@@ -2344,27 +2331,15 @@
2344 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/> 2331 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/>
2345 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/> 2332 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/>
2346 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/> 2333 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/>
2347 <pet id="20014" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2348 <pet id="20015" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2349 <pet id="20016" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2350 <pet id="20017" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2351 <pet id="20018" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2352 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2334 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2353 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/> 2335 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
2354 <pet id="20021" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2355 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/> 2336 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2356 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2337 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2357 <pet id="20024" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2358 <pet id="20025" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2359 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2338 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2360 <pet id="20028" lv="1" skill_id="1004" ack="2" hp="1" congming="10"/>
2361 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2339 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2362 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2340 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2363 <pet id="20038" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2364 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2341 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2365 <pet id="20047" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2366 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2342 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2367 <pet id="30001" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2368 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2343 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2369 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2344 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2370 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2345 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
...@@ -2374,29 +2349,20 @@ ...@@ -2374,29 +2349,20 @@
2374 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2349 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2375 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2350 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2376 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/> 2351 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
2377 <pet id="30012" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2378 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2352 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2379 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/> 2353 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2380 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/> 2354 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
2381 <pet id="30017" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2382 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/> 2355 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
2383 <pet id="30019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2384 <pet id="30020" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2385 <pet id="30021" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2386 <pet id="30022" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2387 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2356 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2388 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2357 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2389 <pet id="30028" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2390 <pet id="30029" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2391 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2358 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2392 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2359 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2393 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/> 2360 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/>
2394 <pet id="30039" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2395 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/> 2361 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/>
2396 2362
2397 </user> 2363 </user>
2398 2364
2399 <user id="1002" name="对手1002" pk_val="500"> 2365 <user id="1002" name="对手1002" pk_val="1000">
2400 <!-- 2366 <!--
2401 id//id 2367 id//id
2402 lv//等级 2368 lv//等级
...@@ -2427,8 +2393,6 @@ ...@@ -2427,8 +2393,6 @@
2427 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/> 2393 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/>
2428 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/> 2394 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/>
2429 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/> 2395 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2430 <pet id="10023" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2431 <pet id="10024" lv="3" skill_id="3001" ack="2" hp="6" congming="30"/>
2432 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/> 2396 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/>
2433 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/> 2397 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/>
2434 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/> 2398 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/>
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
7 wxLogin:道具ID,道具数量cnt 7 wxLogin:道具ID,道具数量cnt
8 --> 8 -->
9 <root> 9 <root>
10 <id item="100001,500;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;600001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/> 10 <id item="100001,2000;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;300001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/>
11 </root> 11 </root>
......
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
43 <common id="22" val="20"/> 43 <common id="22" val="20"/>
44 44
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="1000000"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="1500000"/> 48 <common id="24" val="15"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="1"/> 51 <common id="10000" val="1"/>
......
...@@ -2292,7 +2292,7 @@ ...@@ -2292,7 +2292,7 @@
2292 <!-- 自动战斗对手 2292 <!-- 自动战斗对手
2293 --> 2293 -->
2294 2294
2295 <user id="1001" name="对手1001" pk_val="200"> 2295 <user id="1001" name="对手1001" pk_val="500">
2296 <!-- 2296 <!--
2297 id//id 2297 id//id
2298 lv//等级 2298 lv//等级
...@@ -2315,20 +2315,7 @@ ...@@ -2315,20 +2315,7 @@
2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2318 <pet id="10015" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2319 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2318 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2320 <pet id="10017" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2321 <pet id="10018" lv="1" skill_id="4007" ack="2" hp="6" congming="10"/>
2322 <pet id="10019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2323 <pet id="10020" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2324 <pet id="10021" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2325 <pet id="10022" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2326 <pet id="10023" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2327 <pet id="10024" lv="1" skill_id="3001" ack="2" hp="6" congming="10"/>
2328 <pet id="10027" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2329 <pet id="10029" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2330 <pet id="10032" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2331 <pet id="10052" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2332 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2319 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2333 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2320 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2334 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/> 2321 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
...@@ -2344,27 +2331,15 @@ ...@@ -2344,27 +2331,15 @@
2344 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/> 2331 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/>
2345 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/> 2332 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/>
2346 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/> 2333 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/>
2347 <pet id="20014" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2348 <pet id="20015" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2349 <pet id="20016" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2350 <pet id="20017" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2351 <pet id="20018" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2352 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2334 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2353 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/> 2335 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
2354 <pet id="20021" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2355 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/> 2336 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2356 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2337 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2357 <pet id="20024" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2358 <pet id="20025" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2359 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2338 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2360 <pet id="20028" lv="1" skill_id="1004" ack="2" hp="1" congming="10"/>
2361 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2339 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2362 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2340 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2363 <pet id="20038" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2364 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2341 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2365 <pet id="20047" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2366 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2342 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2367 <pet id="30001" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2368 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2343 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2369 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2344 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2370 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2345 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
...@@ -2374,29 +2349,20 @@ ...@@ -2374,29 +2349,20 @@
2374 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2349 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2375 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2350 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2376 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/> 2351 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
2377 <pet id="30012" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2378 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2352 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2379 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/> 2353 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2380 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/> 2354 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
2381 <pet id="30017" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2382 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/> 2355 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
2383 <pet id="30019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2384 <pet id="30020" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2385 <pet id="30021" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2386 <pet id="30022" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2387 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2356 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2388 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2357 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2389 <pet id="30028" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2390 <pet id="30029" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2391 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2358 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2392 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2359 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2393 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/> 2360 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/>
2394 <pet id="30039" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2395 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/> 2361 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/>
2396 2362
2397 </user> 2363 </user>
2398 2364
2399 <user id="1002" name="对手1002" pk_val="500"> 2365 <user id="1002" name="对手1002" pk_val="1000">
2400 <!-- 2366 <!--
2401 id//id 2367 id//id
2402 lv//等级 2368 lv//等级
...@@ -2427,8 +2393,6 @@ ...@@ -2427,8 +2393,6 @@
2427 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/> 2393 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/>
2428 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/> 2394 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/>
2429 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/> 2395 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2430 <pet id="10023" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2431 <pet id="10024" lv="3" skill_id="3001" ack="2" hp="6" congming="30"/>
2432 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/> 2396 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/>
2433 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/> 2397 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/>
2434 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/> 2398 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/>
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
7 wxLogin:道具ID,道具数量cnt 7 wxLogin:道具ID,道具数量cnt
8 --> 8 -->
9 <root> 9 <root>
10 <id item="100001,500;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;600001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/> 10 <id item="100001,2000;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;300001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/>
11 </root> 11 </root>
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
43 <common id="22" val="20"/> 43 <common id="22" val="20"/>
44 44
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="1000000"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="1500000"/> 48 <common id="24" val="15"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="0"/> 51 <common id="10000" val="1"/>
52 </root> 52 </root>
......
...@@ -2292,7 +2292,7 @@ ...@@ -2292,7 +2292,7 @@
2292 <!-- 自动战斗对手 2292 <!-- 自动战斗对手
2293 --> 2293 -->
2294 2294
2295 <user id="1001" name="对手1001" pk_val="200"> 2295 <user id="1001" name="对手1001" pk_val="500">
2296 <!-- 2296 <!--
2297 id//id 2297 id//id
2298 lv//等级 2298 lv//等级
...@@ -2315,20 +2315,7 @@ ...@@ -2315,20 +2315,7 @@
2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2318 <pet id="10015" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2319 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2318 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2320 <pet id="10017" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2321 <pet id="10018" lv="1" skill_id="4007" ack="2" hp="6" congming="10"/>
2322 <pet id="10019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2323 <pet id="10020" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2324 <pet id="10021" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2325 <pet id="10022" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2326 <pet id="10023" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2327 <pet id="10024" lv="1" skill_id="3001" ack="2" hp="6" congming="10"/>
2328 <pet id="10027" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2329 <pet id="10029" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2330 <pet id="10032" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2331 <pet id="10052" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2332 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2319 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2333 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2320 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2334 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/> 2321 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
...@@ -2344,27 +2331,15 @@ ...@@ -2344,27 +2331,15 @@
2344 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/> 2331 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/>
2345 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/> 2332 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/>
2346 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/> 2333 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/>
2347 <pet id="20014" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2348 <pet id="20015" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2349 <pet id="20016" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2350 <pet id="20017" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2351 <pet id="20018" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2352 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2334 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2353 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/> 2335 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
2354 <pet id="20021" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2355 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/> 2336 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2356 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2337 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2357 <pet id="20024" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2358 <pet id="20025" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2359 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2338 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2360 <pet id="20028" lv="1" skill_id="1004" ack="2" hp="1" congming="10"/>
2361 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2339 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2362 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2340 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2363 <pet id="20038" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2364 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2341 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2365 <pet id="20047" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2366 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2342 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2367 <pet id="30001" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2368 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2343 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2369 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2344 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2370 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2345 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
...@@ -2374,29 +2349,20 @@ ...@@ -2374,29 +2349,20 @@
2374 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2349 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2375 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2350 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2376 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/> 2351 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
2377 <pet id="30012" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2378 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2352 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2379 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/> 2353 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2380 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/> 2354 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
2381 <pet id="30017" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2382 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/> 2355 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
2383 <pet id="30019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2384 <pet id="30020" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2385 <pet id="30021" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2386 <pet id="30022" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2387 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2356 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2388 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2357 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2389 <pet id="30028" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2390 <pet id="30029" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2391 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2358 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2392 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2359 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2393 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/> 2360 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/>
2394 <pet id="30039" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2395 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/> 2361 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/>
2396 2362
2397 </user> 2363 </user>
2398 2364
2399 <user id="1002" name="对手1002" pk_val="500"> 2365 <user id="1002" name="对手1002" pk_val="1000">
2400 <!-- 2366 <!--
2401 id//id 2367 id//id
2402 lv//等级 2368 lv//等级
...@@ -2427,8 +2393,6 @@ ...@@ -2427,8 +2393,6 @@
2427 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/> 2393 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/>
2428 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/> 2394 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/>
2429 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/> 2395 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2430 <pet id="10023" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2431 <pet id="10024" lv="3" skill_id="3001" ack="2" hp="6" congming="30"/>
2432 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/> 2396 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/>
2433 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/> 2397 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/>
2434 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/> 2398 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
2 <userDefaultRoot> 2 <userDefaultRoot>
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <Account>m0800279afc6c</Account> 5 <!---->
6 <Account>m0800278b87c4</Account>
6 <exp>0</exp> 7 <exp>0</exp>
7 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
8 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
25 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
26 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
27 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
28 <uid>1030100010142914</uid> 29 <uid>1000100010142874</uid>
29 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
30 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
31 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
7 wxLogin:道具ID,道具数量cnt 7 wxLogin:道具ID,道具数量cnt
8 --> 8 -->
9 <root> 9 <root>
10 <id item="100001,500;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;600001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/> 10 <id item="100001,2000;910074,1;910026,1;920011,1;920042,1;200001,3;800093,1;800094,1;800095,1;700001,1;300001,5" pet="10001,0;20002,0;30003,0;20051,0" wxLogin="100001,0"/>
11 </root> 11 </root>
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
43 <common id="22" val="20"/> 43 <common id="22" val="20"/>
44 44
45 <!--每日PK次数上限--> 45 <!--每日PK次数上限-->
46 <common id="23" val="1000000"/> 46 <common id="23" val="10"/>
47 <!--每日vip,PK次数上限--> 47 <!--每日vip,PK次数上限-->
48 <common id="24" val="1500000"/> 48 <common id="24" val="15"/>
49 49
50 <!--是否开启vip--> 50 <!--是否开启vip-->
51 <common id="10000" val="0"/> 51 <common id="10000" val="1"/>
52 </root> 52 </root>
......
...@@ -2292,7 +2292,7 @@ ...@@ -2292,7 +2292,7 @@
2292 <!-- 自动战斗对手 2292 <!-- 自动战斗对手
2293 --> 2293 -->
2294 2294
2295 <user id="1001" name="对手1001" pk_val="200"> 2295 <user id="1001" name="对手1001" pk_val="500">
2296 <!-- 2296 <!--
2297 id//id 2297 id//id
2298 lv//等级 2298 lv//等级
...@@ -2315,20 +2315,7 @@ ...@@ -2315,20 +2315,7 @@
2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2315 <pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2316 <pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2317 <pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2318 <pet id="10015" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2319 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2318 <pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2320 <pet id="10017" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2321 <pet id="10018" lv="1" skill_id="4007" ack="2" hp="6" congming="10"/>
2322 <pet id="10019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2323 <pet id="10020" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2324 <pet id="10021" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2325 <pet id="10022" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2326 <pet id="10023" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2327 <pet id="10024" lv="1" skill_id="3001" ack="2" hp="6" congming="10"/>
2328 <pet id="10027" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2329 <pet id="10029" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2330 <pet id="10032" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2331 <pet id="10052" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2332 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2319 <pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2333 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2320 <pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2334 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/> 2321 <pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
...@@ -2344,27 +2331,15 @@ ...@@ -2344,27 +2331,15 @@
2344 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/> 2331 <pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/>
2345 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/> 2332 <pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/>
2346 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/> 2333 <pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/>
2347 <pet id="20014" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2348 <pet id="20015" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2349 <pet id="20016" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2350 <pet id="20017" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2351 <pet id="20018" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2352 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2334 <pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
2353 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/> 2335 <pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
2354 <pet id="20021" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2355 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/> 2336 <pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
2356 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2337 <pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2357 <pet id="20024" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2358 <pet id="20025" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2359 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2338 <pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2360 <pet id="20028" lv="1" skill_id="1004" ack="2" hp="1" congming="10"/>
2361 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2339 <pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2362 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/> 2340 <pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
2363 <pet id="20038" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2364 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2341 <pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2365 <pet id="20047" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2366 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2342 <pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2367 <pet id="30001" lv="1" skill_id="2003" ack="2" hp="5" congming="10"/>
2368 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/> 2343 <pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
2369 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/> 2344 <pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
2370 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/> 2345 <pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
...@@ -2374,29 +2349,20 @@ ...@@ -2374,29 +2349,20 @@
2374 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/> 2349 <pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
2375 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/> 2350 <pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
2376 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/> 2351 <pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
2377 <pet id="30012" lv="1" skill_id="2002" ack="2" hp="5" congming="10"/>
2378 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/> 2352 <pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
2379 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/> 2353 <pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
2380 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/> 2354 <pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
2381 <pet id="30017" lv="1" skill_id="1000" ack="3" hp="5" congming="10"/>
2382 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/> 2355 <pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
2383 <pet id="30019" lv="1" skill_id="2001" ack="4" hp="4" congming="10"/>
2384 <pet id="30020" lv="1" skill_id="4009" ack="3" hp="5" congming="10"/>
2385 <pet id="30021" lv="1" skill_id="2000" ack="1" hp="9" congming="10"/>
2386 <pet id="30022" lv="1" skill_id="4008" ack="2" hp="6" congming="10"/>
2387 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/> 2356 <pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
2388 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/> 2357 <pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
2389 <pet id="30028" lv="1" skill_id="1006" ack="2" hp="6" congming="10"/>
2390 <pet id="30029" lv="1" skill_id="1003" ack="2" hp="6" congming="10"/>
2391 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/> 2358 <pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
2392 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/> 2359 <pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
2393 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/> 2360 <pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/>
2394 <pet id="30039" lv="1" skill_id="1001" ack="2" hp="6" congming="10"/>
2395 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/> 2361 <pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/>
2396 2362
2397 </user> 2363 </user>
2398 2364
2399 <user id="1002" name="对手1002" pk_val="500"> 2365 <user id="1002" name="对手1002" pk_val="1000">
2400 <!-- 2366 <!--
2401 id//id 2367 id//id
2402 lv//等级 2368 lv//等级
...@@ -2427,8 +2393,6 @@ ...@@ -2427,8 +2393,6 @@
2427 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/> 2393 <pet id="10020" lv="3" skill_id="4008" ack="2" hp="6" congming="30"/>
2428 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/> 2394 <pet id="10021" lv="3" skill_id="1001" ack="2" hp="6" congming="30"/>
2429 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/> 2395 <pet id="10022" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2430 <pet id="10023" lv="3" skill_id="1006" ack="2" hp="6" congming="30"/>
2431 <pet id="10024" lv="3" skill_id="3001" ack="2" hp="6" congming="30"/>
2432 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/> 2396 <pet id="10027" lv="3" skill_id="2000" ack="1" hp="9" congming="30"/>
2433 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/> 2397 <pet id="10029" lv="3" skill_id="4009" ack="3" hp="5" congming="30"/>
2434 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/> 2398 <pet id="10032" lv="3" skill_id="1003" ack="2" hp="6" congming="30"/>
......

48.4 KB | W: | H:

48.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.6 KB | W: | H:

3.19 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.56 KB | W: | H:

2.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -34,6 +34,7 @@ strings.msg_1030 = "小屋只能摆放5个宠物，你已经摆满了哦"; ...@@ -34,6 +34,7 @@ strings.msg_1030 = "小屋只能摆放5个宠物，你已经摆满了哦";
34 strings.msg_1031 = "你还没有获得这只宠物"; 34 strings.msg_1031 = "你还没有获得这只宠物";
35 strings.msg_1032 = "钻石不足,去充值吧！"; 35 strings.msg_1032 = "钻石不足,去充值吧！";
36 strings.msg_1033 = "不能再放了，先收起来一些吧！"; 36 strings.msg_1033 = "不能再放了，先收起来一些吧！";
37 strings.msg_1034 = "金豆不足\n去玩小游戏换取更多金豆";
37 38
38 strings.msg_2001 = "牌型不对哦！"; 39 strings.msg_2001 = "牌型不对哦！";
39 strings.msg_2002 = "是否确定要退出游戏房间？"; 40 strings.msg_2002 = "是否确定要退出游戏房间？";
......
...@@ -151,10 +151,12 @@ function OtherHomeScene:showPets(pet_home) ...@@ -151,10 +151,12 @@ function OtherHomeScene:showPets(pet_home)
151 end 151 end
152 152
153 function OtherHomeScene:addPet(id,idx) 153 function OtherHomeScene:addPet(id,idx)
154 local sp = cc.Sprite:create("res/pet/icon/"..id..".png"); 154 local pet_info = PetInfo.get_pet_info(id);
155 sp:setName("pet_"..id); 155 local sp = cc.Sprite:create("res/pet/icon/" .. id .. ".png");
156 sp:setAnchorPoint(cc.p(0.5,0)); 156 sp:setName("pet_" .. id);
157 sp:setAnchorPoint(cc.p(0.5, 0));
157 sp:setPosition(pets_pos_list[idx]); 158 sp:setPosition(pets_pos_list[idx]);
159 sp:setScale(pet_info.scale);
158 160
159 self.panel_decorate:addChild(sp); 161 self.panel_decorate:addChild(sp);
160 162
......
...@@ -129,6 +129,13 @@ function AchievementDetialView:updateItems() ...@@ -129,6 +129,13 @@ function AchievementDetialView:updateItems()
129 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/ui/achievement/gray_"..self.main_id.."_"..self.step_id..".png"):getSpriteFrame()); 129 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/ui/achievement/gray_"..self.main_id.."_"..self.step_id..".png"):getSpriteFrame());
130 end 130 end
131 131
132 local left_vip_day = UserModel.getLeftVipDay();
133 local total_val = info.data;
134 if self.main_id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条
135 item:getChildByName("LoadingBar"):setVisible(false);
136 item:getChildByName("txt_progress"):setString("0/" .. total_val);
137 end
138
132 self.nodes[2][#self.nodes[2]+1] = item; 139 self.nodes[2][#self.nodes[2]+1] = item;
133 140
134 item.fn = function () 141 item.fn = function ()
......
...@@ -48,6 +48,7 @@ function AchievementView:show() ...@@ -48,6 +48,7 @@ function AchievementView:show()
48 print("achievement next level reward item id:", itemArr[1]); 48 print("achievement next level reward item id:", itemArr[1]);
49 -- icon:setSpriteFrame(cc.Sprite:create("res/icon/"..itemArr[1]..".png"):getSpriteFrame()); 49 -- icon:setSpriteFrame(cc.Sprite:create("res/icon/"..itemArr[1]..".png"):getSpriteFrame());
50 panel:getChildByName("panel_reward"):getChildByName("txt_reward_num"):setString(itemArr[2]); 50 panel:getChildByName("panel_reward"):getChildByName("txt_reward_num"):setString(itemArr[2]);
51 panel:getChildByName("panel_reward"):getChildByName("gold_num"):setString("金豆*"..itemArr[2]);
51 52
52 local per = math.floor(achievement_cnt / nextLevelInfo.cnt * 100); 53 local per = math.floor(achievement_cnt / nextLevelInfo.cnt * 100);
53 panel:getChildByName("panel_reward"):getChildByName("LoadingBar"):setPercent(per); 54 panel:getChildByName("panel_reward"):getChildByName("LoadingBar"):setPercent(per);
...@@ -115,6 +116,9 @@ function AchievementView:updateItems() ...@@ -115,6 +116,9 @@ function AchievementView:updateItems()
115 if _list[i] and _list[i].viewid==10 then 116 if _list[i] and _list[i].viewid==10 then
116 table.remove(_list,i); 117 table.remove(_list,i);
117 end 118 end
119 if _list[i] and _list[i].viewid==11 then
120 table.remove(_list,i);
121 end
118 end 122 end
119 end 123 end
120 124
...@@ -154,7 +158,13 @@ function AchievementView:updateItems() ...@@ -154,7 +158,13 @@ function AchievementView:updateItems()
154 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 158 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
155 end 159 end
156 if not TableUtil.IsInTable(achievement_data.get_reward_id, ii) then 160 if not TableUtil.IsInTable(achievement_data.get_reward_id, ii) then
161 local left_vip_day = UserModel.getLeftVipDay();
162 if info.id==10 and left_vip_day <= 0 then --不是会员，不能领取这个成就
163 item:getChildByName("btn_get"):setVisible(false);
164 else
157 item:getChildByName("btn_get"):setVisible(true); 165 item:getChildByName("btn_get"):setVisible(true);
166 end
167
158 item:getChildByName("yilingqu"):setVisible(false); 168 item:getChildByName("yilingqu"):setVisible(false);
159 169
160 item:getChildByName("txt_des"):setVisible(false); 170 item:getChildByName("txt_des"):setVisible(false);
...@@ -175,9 +185,17 @@ function AchievementView:updateItems() ...@@ -175,9 +185,17 @@ function AchievementView:updateItems()
175 if achievement_data then 185 if achievement_data then
176 cur_val = achievement_data.data; 186 cur_val = achievement_data.data;
177 end 187 end
178 item:getChildByName("txt_progress"):setString(cur_val .. "/" .. total_val); 188
179 local per = math.floor(cur_val / total_val * 100); 189 local per = math.floor(cur_val / total_val * 100);
190
191 local left_vip_day = UserModel.getLeftVipDay();
192 if info.id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条
193 item:getChildByName("LoadingBar"):setVisible(false);
194 item:getChildByName("txt_progress"):setString("0/" .. total_val);
195 else
180 item:getChildByName("LoadingBar"):setPercent(per); 196 item:getChildByName("LoadingBar"):setPercent(per);
197 item:getChildByName("txt_progress"):setString(cur_val .. "/" .. total_val);
198 end
181 199
182 item:getChildByName("yilingqu"):setVisible(false); 200 item:getChildByName("yilingqu"):setVisible(false);
183 item:getChildByName("btn_get"):setVisible(false); 201 item:getChildByName("btn_get"):setVisible(false);
...@@ -218,6 +236,13 @@ function AchievementView:onGetRewardClick(ref, type) ...@@ -218,6 +236,13 @@ function AchievementView:onGetRewardClick(ref, type)
218 236
219 local achievement_data = UserModel.getAchievementByID(ref.main_id); 237 local achievement_data = UserModel.getAchievementByID(ref.main_id);
220 if achievement_data and achievement_data.data >= ref.step_info.data and not TableUtil.IsInTable(achievement_data.get_reward_id, ref.step_id) then 238 if achievement_data and achievement_data.data >= ref.step_info.data and not TableUtil.IsInTable(achievement_data.get_reward_id, ref.step_id) then
239
240 local left_vip_day = UserModel.getLeftVipDay();
241 if ref.main_id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条
242 return ;
243 end
244
245
221 local item = ref:getParent(); 246 local item = ref:getParent();
222 ref:setVisible(false); 247 ref:setVisible(false);
223 item:getChildByName("txt_progress"):setVisible(false); 248 item:getChildByName("txt_progress"):setVisible(false);
...@@ -294,6 +319,9 @@ function AchievementView:setScrollPosition(node) ...@@ -294,6 +319,9 @@ function AchievementView:setScrollPosition(node)
294 if _list[i] and _list[i].viewid==10 then 319 if _list[i] and _list[i].viewid==10 then
295 table.remove(_list,i); 320 table.remove(_list,i);
296 end 321 end
322 if _list[i] and _list[i].viewid==11 then
323 table.remove(_list,i);
324 end
297 end 325 end
298 end 326 end
299 327
......
...@@ -200,6 +200,7 @@ function ActivityVipView:update(_is_init) ...@@ -200,6 +200,7 @@ function ActivityVipView:update(_is_init)
200 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 200 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
201 end 201 end
202 local itemInfo = ItemInfo.getItemInfo(itemList2[i].id); 202 local itemInfo = ItemInfo.getItemInfo(itemList2[i].id);
203 logD("获取礼包细节名称------------------》"..itemInfo.name);
203 item:getChildByName("txt"):setString(itemInfo.name.."x"..StringUtil.getWanString(itemList2[i].num)); 204 item:getChildByName("txt"):setString(itemInfo.name.."x"..StringUtil.getWanString(itemList2[i].num));
204 else 205 else
205 item:setVisible(false); 206 item:setVisible(false);
......
...@@ -12,9 +12,12 @@ function PetFightView:init(_nodes,_update_nodes_func) ...@@ -12,9 +12,12 @@ function PetFightView:init(_nodes,_update_nodes_func)
12 --GameConfig.pk_num_vip; --每日VIP，pk次数上限 12 --GameConfig.pk_num_vip; --每日VIP，pk次数上限
13 --UserModel.user_info.pk_daily_cnt; --今日已pk次数 13 --UserModel.user_info.pk_daily_cnt; --今日已pk次数
14 local left_vip_day = UserModel.getLeftVipDay(); 14 local left_vip_day = UserModel.getLeftVipDay();
15 self.remain_value=0;
15 if left_vip_day > 0 then 16 if left_vip_day > 0 then
17 self.remain_value=GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt;
16 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt)); 18 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num_vip-UserModel.user_info.pk_daily_cnt));
17 else 19 else
20 self.remain_value=GameConfig.pk_num-UserModel.user_info.pk_daily_cnt;
18 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt)); 21 self:getChildByName("pk_num"):setString("今日剩余次数："..(GameConfig.pk_num-UserModel.user_info.pk_daily_cnt));
19 end 22 end
20 23
...@@ -155,8 +158,10 @@ end ...@@ -155,8 +158,10 @@ end
155 158
156 function PetFightView:onScoreFightClick() 159 function PetFightView:onScoreFightClick()
157 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id); 160 local team_v = UserModel.get_pet_team_by_id(UserModel.team_id);
158 161 if self.remain_value<=0 then
159 if #team_v.pet_id == 4 then 162 Alert.showOne("今日挑战次数已用完\n明天再来哦");
163 return;
164 elseif #team_v.pet_id == 4 then
160 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun); 165 self.notifyLobbyEntterCallbackFun = handler(self,self.onNotifyLobbyEntterCallBackFun);
161 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun); 166 cmsg.on("gateway_msg.lobby_enter_msg_res",self.notifyLobbyEntterCallbackFun);
162 167
......
...@@ -89,11 +89,11 @@ end ...@@ -89,11 +89,11 @@ end
89 89
90 function PetView:setTab(_tabIndex) 90 function PetView:setTab(_tabIndex)
91 _index = _tabIndex; 91 _index = _tabIndex;
92 self:updateTabState(); 92 --self:updateTabState();
93 end 93 end
94 94
95 function PetView:updateTabState() 95 function PetView:updateTabState()
96 for i=1,2 do 96 --[[for i=1,2 do
97 local tab = self:getChildByName("tab_"..i); 97 local tab = self:getChildByName("tab_"..i);
98 local select = tab:getChildByName("select"); 98 local select = tab:getChildByName("select");
99 if i == _index then 99 if i == _index then
...@@ -104,7 +104,7 @@ function PetView:updateTabState() ...@@ -104,7 +104,7 @@ function PetView:updateTabState()
104 tab.is_selected = false; 104 tab.is_selected = false;
105 select:setVisible(false); 105 select:setVisible(false);
106 end 106 end
107 end 107 end--]]
108 end 108 end
109 109
110 function PetView:onTouchBegin(event) 110 function PetView:onTouchBegin(event)
...@@ -141,6 +141,8 @@ function PetView:updateTabShow() ...@@ -141,6 +141,8 @@ function PetView:updateTabShow()
141 self.content_layer.view:init(self.nodes,handler(self,self.update_nodes)); 141 self.content_layer.view:init(self.nodes,handler(self,self.update_nodes));
142 self.content_layer:addChild(self.content_layer.view); 142 self.content_layer:addChild(self.content_layer.view);
143 143
144 --self.ui = cc.CSLoader:createNode("ui/pet/PetFightOptionLayer.csb");
145 --self:updateSelectedState(self.ui:getChildByName("btn_1"),false);
144 --解决默认焦点框不跳转问题 146 --解决默认焦点框不跳转问题
145 self:onKeypadDown(); 147 self:onKeypadDown();
146 --end 148 --end
...@@ -150,13 +152,13 @@ function PetView:update_nodes(_nodes) ...@@ -150,13 +152,13 @@ function PetView:update_nodes(_nodes)
150 self.nodes = _nodes; 152 self.nodes = _nodes;
151 end 153 end
152 154
153 function PetView:update_nodes_state(node) 155 --[[function PetView:update_nodes_state(node)
154 if node then 156 if node then
155 self:updateSelectedState(node,false); 157 self:updateSelectedState(node,false);
156 else 158 else
157 self:updateSelectedState(self:getChildByName("tab_".._index),false); 159 self:updateSelectedState(self:getChildByName("tab_".._index),false);
158 end 160 end
159 end 161 end--]]
160 162
161 function PetView:onBagClick() 163 function PetView:onBagClick()
162 local reciever = require("app.views.view.RoleMainView"):show(3); 164 local reciever = require("app.views.view.RoleMainView"):show(3);
......
...@@ -150,9 +150,16 @@ function ShopExchangeView:onOkFn(ref) ...@@ -150,9 +150,16 @@ function ShopExchangeView:onOkFn(ref)
150 if shopInfo.costList[1].id == 100000 then 150 if shopInfo.costList[1].id == 100000 then
151 Alert.showTwo(strings.msg_1032,okFun); 151 Alert.showTwo(strings.msg_1032,okFun);
152 else 152 else
153 --Alert.showTwo(strings.msg_1003,okFun);
154
155 if NEED_PAY==0 then
156 function okFun() end;
157 Alert.showTwo(strings.msg_1034,okFun);
158 else
153 Alert.showTwo(strings.msg_1003,okFun); 159 Alert.showTwo(strings.msg_1003,okFun);
154 end 160 end
155 end 161 end
162 end
156 end 163 end
157 164
158 function ShopExchangeView:onBuyCallBack(params) 165 function ShopExchangeView:onBuyCallBack(params)
......
...@@ -70,7 +70,7 @@ function ShopView:init() ...@@ -70,7 +70,7 @@ function ShopView:init()
70 local tab = self.panel:getChildByName("tab_"..i); 70 local tab = self.panel:getChildByName("tab_"..i);
71 71
72 --判断是否支持支付模式 72 --判断是否支持支付模式
73 if NEED_PAY==0 and i==5 or i==6 then --隐藏金豆、钻石 73 if (NEED_PAY==0 and i==5) or (NEED_PAY==0 and i==6) then --隐藏金豆、钻石
74 tab:setVisible(false); 74 tab:setVisible(false);
75 else 75 else
76 tab:setTag(i); 76 tab:setTag(i);
...@@ -95,6 +95,10 @@ function ShopView:init() ...@@ -95,6 +95,10 @@ function ShopView:init()
95 95
96 self.nodesCopy = TableUtil.copyTab(self.nodes); 96 self.nodesCopy = TableUtil.copyTab(self.nodes);
97 97
98 if NEED_PAY==0 then
99 self.panel:getChildByName("img_diamond"):setVisible(false);
100 end
101
98 self.panel:getChildByName("img_diamond"):getChildByName("txt"):setString(StringUtil.getWanString(UserModel.getDiamond())); 102 self.panel:getChildByName("img_diamond"):getChildByName("txt"):setString(StringUtil.getWanString(UserModel.getDiamond()));
99 self.panel:getChildByName("panel_money"):getChildByName("txt"):setString(StringUtil.getWanString(UserModel.getCoin())); 103 self.panel:getChildByName("panel_money"):getChildByName("txt"):setString(StringUtil.getWanString(UserModel.getCoin()));
100 104
...@@ -355,9 +359,14 @@ function ShopView:onBuyClick(ref,event) ...@@ -355,9 +359,14 @@ function ShopView:onBuyClick(ref,event)
355 if shopItemInfo.costList[1].id == 100000 then 359 if shopItemInfo.costList[1].id == 100000 then
356 Alert.showTwo(strings.msg_1032,okFun); 360 Alert.showTwo(strings.msg_1032,okFun);
357 else 361 else
362 if NEED_PAY==0 then
363 function okFun() end;
364 Alert.showTwo(strings.msg_1034,okFun);
365 else
358 Alert.showTwo(strings.msg_1003,okFun); 366 Alert.showTwo(strings.msg_1003,okFun);
359 end 367 end
360 end 368 end
369 end
361 UmengHelper.onEvent("shop_item_click_"..shopItemInfo.id); 370 UmengHelper.onEvent("shop_item_click_"..shopItemInfo.id);
362 end 371 end
363 end 372 end
...@@ -377,8 +386,13 @@ function ShopView:onBuyCallBack(params) ...@@ -377,8 +386,13 @@ function ShopView:onBuyCallBack(params)
377 if shopItemInfo.costList[1].id == 100000 then 386 if shopItemInfo.costList[1].id == 100000 then
378 Alert.showTwo(strings.msg_1032,okFun); 387 Alert.showTwo(strings.msg_1032,okFun);
379 else 388 else
389 if NEED_PAY==0 then
390 function okFun() end;
391 Alert.showTwo(strings.msg_1034,okFun);
392 else
380 Alert.showTwo(strings.msg_1003,okFun); 393 Alert.showTwo(strings.msg_1003,okFun);
381 end 394 end
395 end
382 else 396 else
383 Alert.showOne(strings.msg_1010); 397 Alert.showOne(strings.msg_1010);
384 end 398 end
......
...@@ -21,7 +21,7 @@ function XyxPayView:show(game_id,onPaySuccessFun) ...@@ -21,7 +21,7 @@ function XyxPayView:show(game_id,onPaySuccessFun)
21 21
22 inst.layer = cc.Layer:create(); 22 inst.layer = cc.Layer:create();
23 inst:addChild(inst.layer,1); 23 inst:addChild(inst.layer,1);
24 registerScriptTouchEvent(inst.layer,handler(inst,inst.onTouchBegin),handler(inst,inst.onTouchMove),handler(inst,inst.onTouchEnd)); 24 --registerScriptTouchEvent(inst.layer,handler(inst,inst.onTouchBegin),handler(inst,inst.onTouchMove),handler(inst,inst.onTouchEnd));
25 25
26 inst:init(); 26 inst:init();
27 27
...@@ -51,7 +51,7 @@ function XyxPayView:init() ...@@ -51,7 +51,7 @@ function XyxPayView:init()
51 51
52 local game_info = SingleGameInfo.get_game_info(self.game_id); 52 local game_info = SingleGameInfo.get_game_info(self.game_id);
53 self.panel:getChildByName("txt_name"):setString(game_info.name); 53 self.panel:getChildByName("txt_name"):setString(game_info.name);
54 local icon_url = "res/ui/xyx/img_xyx_"..self.game_id..".png"; 54 local icon_url = "res/ui/xyx/xyx_"..self.game_id..".png";
55 print("sssssssss",icon_url) 55 print("sssssssss",icon_url)
56 if cc.FileUtils:getInstance():isFileExist(icon_url) then 56 if cc.FileUtils:getInstance():isFileExist(icon_url) then
57 self.panel:getChildByName("img"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 57 self.panel:getChildByName("img"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
...@@ -65,8 +65,8 @@ function XyxPayView:init() ...@@ -65,8 +65,8 @@ function XyxPayView:init()
65 -- local shopInfo = ShopInfo.getPayInfo(game_info.payid); 65 -- local shopInfo = ShopInfo.getPayInfo(game_info.payid);
66 self.panel:getChildByName("txt_price"):setString(game_info.diamond.."钻石"); 66 self.panel:getChildByName("txt_price"):setString(game_info.diamond.."钻石");
67 67
68 self.nodes[#self.nodes+1] = {self.btn_close}; 68 --self.nodes[#self.nodes+1] = {self.btn_close};
69 self.nodes[#self.nodes+1] = {self.btn_buy,self.btn_vip_month,self.btn_vip_year}; 69 self.nodes[#self.nodes+1] = {self.btn_buy,self.btn_vip_month,self.btn_vip_year,self.btn_close};
70 70
71 self:updateSelectedState(self.btn_vip_month); 71 self:updateSelectedState(self.btn_vip_month);
72 72
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
6 <ObjectData Name="Layer" Tag="483" ctype="GameLayerObjectData"> 6 <ObjectData Name="Layer" Tag="483" ctype="GameLayerObjectData">
7 <Size X="186.0000" Y="210.0000" /> 7 <Size X="186.0000" Y="210.0000" />
8 <Children> 8 <Children>
9 <AbstractNodeData Name="bg" ActionTag="1114618036" Tag="484" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="0.0016" RightMargin="-0.0016" TopMargin="2.9987" BottomMargin="-2.9987" ctype="SpriteObjectData"> 9 <AbstractNodeData Name="bg" ActionTag="1114618036" Tag="484" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" TopMargin="3.0030" BottomMargin="-3.0030" ctype="SpriteObjectData">
10 <Size X="186.0000" Y="210.0000" /> 10 <Size X="186.0000" Y="210.0000" />
11 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 11 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
12 <Position X="93.0016" Y="102.0013" /> 12 <Position X="93.0000" Y="101.9970" />
13 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 13 <Scale ScaleX="1.0000" ScaleY="1.0000" />
14 <CColor A="255" R="255" G="255" B="255" /> 14 <CColor A="255" R="255" G="255" B="255" />
15 <PrePosition X="0.5000" Y="0.4857" /> 15 <PrePosition X="0.5000" Y="0.4857" />
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
43 <FileData Type="Normal" Path="ui/dress/icon_pet_default.png" Plist="" /> 43 <FileData Type="Normal" Path="ui/dress/icon_pet_default.png" Plist="" />
44 <BlendFunc Src="1" Dst="771" /> 44 <BlendFunc Src="1" Dst="771" />
45 </AbstractNodeData> 45 </AbstractNodeData>
46 <AbstractNodeData Name="txt" ActionTag="483930160" Tag="486" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="43.5487" RightMargin="62.4513" TopMargin="166.9394" BottomMargin="23.0606" FontSize="20" LabelText="敬请期待" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ShadowEnabled="True" ctype="TextObjectData"> 46 <AbstractNodeData Name="txt" ActionTag="483930160" Tag="486" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="43.5512" RightMargin="62.4488" TopMargin="166.9394" BottomMargin="23.0606" FontSize="20" LabelText="敬请期待" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ShadowEnabled="True" ctype="TextObjectData">
47 <Size X="80.0000" Y="20.0000" /> 47 <Size X="80.0000" Y="20.0000" />
48 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 48 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
49 <Position X="83.5487" Y="33.0606" /> 49 <Position X="83.5512" Y="33.0606" />
50 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 50 <Scale ScaleX="1.0000" ScaleY="1.0000" />
51 <CColor A="255" R="255" G="255" B="255" /> 51 <CColor A="255" R="255" G="255" B="255" />
52 <PrePosition X="0.4492" Y="0.1574" /> 52 <PrePosition X="0.4492" Y="0.1574" />
...@@ -137,14 +137,15 @@ ...@@ -137,14 +137,15 @@
137 <AbstractNodeData Name="bg_blood" ActionTag="-1334741479" Tag="712" IconVisible="False" LeftMargin="138.8230" RightMargin="15.1770" TopMargin="123.5180" BottomMargin="56.4820" LeftEage="10" RightEage="10" TopEage="9" BottomEage="9" Scale9OriginX="10" Scale9OriginY="9" Scale9Width="12" Scale9Height="12" ctype="ImageViewObjectData"> 137 <AbstractNodeData Name="bg_blood" ActionTag="-1334741479" Tag="712" IconVisible="False" LeftMargin="138.8230" RightMargin="15.1770" TopMargin="123.5180" BottomMargin="56.4820" LeftEage="10" RightEage="10" TopEage="9" BottomEage="9" Scale9OriginX="10" Scale9OriginY="9" Scale9Width="12" Scale9Height="12" ctype="ImageViewObjectData">
138 <Size X="32.0000" Y="30.0000" /> 138 <Size X="32.0000" Y="30.0000" />
139 <Children> 139 <Children>
140 <AbstractNodeData Name="txt" ActionTag="888394821" Tag="714" IconVisible="False" LeftMargin="12.4103" RightMargin="11.5897" TopMargin="5.4362" BottomMargin="8.5638" FontSize="16" LabelText="5" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 140 <AbstractNodeData Name="txt" ActionTag="888394821" Tag="714" IconVisible="False" LeftMargin="5.6815" RightMargin="3.3185" TopMargin="2.7077" BottomMargin="4.2923" FontSize="16" LabelText="54" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
141 <Size X="8.0000" Y="16.0000" /> 141 <Size X="23.0000" Y="23.0000" />
142 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 142 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
143 <Position X="16.4103" Y="16.5638" /> 143 <Position X="17.1815" Y="15.7923" />
144 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 144 <Scale ScaleX="1.0000" ScaleY="1.0000" />
145 <CColor A="255" R="255" G="255" B="255" /> 145 <CColor A="255" R="255" G="255" B="255" />
146 <PrePosition X="0.5128" Y="0.5521" /> 146 <PrePosition X="0.5369" Y="0.5264" />
147 <PreSize X="0.2500" Y="0.5333" /> 147 <PreSize X="0.7188" Y="0.7667" />
148 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
148 <OutlineColor A="255" R="255" G="0" B="0" /> 149 <OutlineColor A="255" R="255" G="0" B="0" />
149 <ShadowColor A="255" R="110" G="110" B="110" /> 150 <ShadowColor A="255" R="110" G="110" B="110" />
150 </AbstractNodeData> 151 </AbstractNodeData>
...@@ -160,15 +161,16 @@ ...@@ -160,15 +161,16 @@
160 <AbstractNodeData Name="bg_attack" ActionTag="1200808751" Tag="713" IconVisible="False" LeftMargin="16.5948" RightMargin="134.4052" TopMargin="121.0971" BottomMargin="53.9029" LeftEage="11" RightEage="11" TopEage="11" BottomEage="11" Scale9OriginX="11" Scale9OriginY="11" Scale9Width="13" Scale9Height="13" ctype="ImageViewObjectData"> 161 <AbstractNodeData Name="bg_attack" ActionTag="1200808751" Tag="713" IconVisible="False" LeftMargin="16.5948" RightMargin="134.4052" TopMargin="121.0971" BottomMargin="53.9029" LeftEage="11" RightEage="11" TopEage="11" BottomEage="11" Scale9OriginX="11" Scale9OriginY="11" Scale9Width="13" Scale9Height="13" ctype="ImageViewObjectData">
161 <Size X="35.0000" Y="35.0000" /> 162 <Size X="35.0000" Y="35.0000" />
162 <Children> 163 <Children>
163 <AbstractNodeData Name="txt" ActionTag="-691298144" Tag="715" IconVisible="False" LeftMargin="13.4565" RightMargin="13.5435" TopMargin="7.0499" BottomMargin="11.9501" FontSize="16" LabelText="5" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 164 <AbstractNodeData Name="txt" ActionTag="-691298144" Tag="715" IconVisible="False" LeftMargin="6.9814" RightMargin="6.0186" TopMargin="6.6649" BottomMargin="7.3351" FontSize="16" LabelText="55" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
164 <Size X="8.0000" Y="16.0000" /> 165 <Size X="22.0000" Y="21.0000" />
165 <AnchorPoint ScaleX="0.4625" ScaleY="0.5372" /> 166 <AnchorPoint ScaleX="0.4625" ScaleY="0.5372" />
166 <Position X="17.1565" Y="20.5453" /> 167 <Position X="17.1564" Y="18.6163" />
167 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 168 <Scale ScaleX="1.0000" ScaleY="1.0000" />
168 <CColor A="255" R="255" G="255" B="255" /> 169 <CColor A="255" R="255" G="255" B="255" />
169 <PrePosition X="0.4902" Y="0.5870" /> 170 <PrePosition X="0.4902" Y="0.5319" />
170 <PreSize X="0.2286" Y="0.4571" /> 171 <PreSize X="0.6000" Y="0.5429" />
171 <OutlineColor A="255" R="255" G="0" B="0" /> 172 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
173 <OutlineColor A="255" R="30" G="144" B="255" />
172 <ShadowColor A="255" R="110" G="110" B="110" /> 174 <ShadowColor A="255" R="110" G="110" B="110" />
173 </AbstractNodeData> 175 </AbstractNodeData>
174 </Children> 176 </Children>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <AbstractNodeData Name="tab_1" ActionTag="-1202199351" VisibleForFrame="False" Tag="254" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="156.6800" RightMargin="1037.3199" TopMargin="7.9880" BottomMargin="623.0120" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="56" Scale9Height="67" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 33 <AbstractNodeData Name="tab_1" ActionTag="-1202199351" VisibleForFrame="False" Tag="254" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="156.6800" RightMargin="1037.3199" TopMargin="7.9880" BottomMargin="623.0120" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="56" Scale9Height="67" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
34 <Size X="86.0000" Y="89.0000" /> 34 <Size X="86.0000" Y="89.0000" />
35 <Children> 35 <Children>
36 <AbstractNodeData Name="select" CanEdit="False" Visible="False" ActionTag="-1711239123" Tag="47" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-5.0000" RightMargin="-5.0000" TopMargin="-5.4857" BottomMargin="-35.5143" ctype="SpriteObjectData"> 36 <AbstractNodeData Name="select" CanEdit="False" ActionTag="-1711239123" Tag="47" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="-5.0000" RightMargin="-5.0000" TopMargin="-5.4857" BottomMargin="-35.5143" ctype="SpriteObjectData">
37 <Size X="96.0000" Y="130.0000" /> 37 <Size X="96.0000" Y="130.0000" />
38 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 38 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
39 <Position X="43.0000" Y="29.4857" /> 39 <Position X="43.0000" Y="29.4857" />
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 <OutlineColor A="255" R="255" G="0" B="0" /> 126 <OutlineColor A="255" R="255" G="0" B="0" />
127 <ShadowColor A="255" R="110" G="110" B="110" /> 127 <ShadowColor A="255" R="110" G="110" B="110" />
128 </AbstractNodeData> 128 </AbstractNodeData>
129 <AbstractNodeData Name="btn_bag" ActionTag="723358617" Tag="212" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="1089.2719" RightMargin="22.7281" TopMargin="18.1240" BottomMargin="634.8760" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="138" Scale9Height="45" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData"> 129 <AbstractNodeData Name="btn_bag" ActionTag="723358617" Tag="212" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="1089.2480" RightMargin="22.7520" TopMargin="18.1240" BottomMargin="634.8760" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="138" Scale9Height="45" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
130 <Size X="168.0000" Y="67.0000" /> 130 <Size X="168.0000" Y="67.0000" />
131 <Children> 131 <Children>
132 <AbstractNodeData Name="selected" Visible="False" ActionTag="305243408" Tag="213" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData"> 132 <AbstractNodeData Name="selected" Visible="False" ActionTag="305243408" Tag="213" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 </AbstractNodeData> 142 </AbstractNodeData>
143 </Children> 143 </Children>
144 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 144 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
145 <Position X="1173.2719" Y="668.3760" /> 145 <Position X="1173.2480" Y="668.3760" />
146 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 146 <Scale ScaleX="1.0000" ScaleY="1.0000" />
147 <CColor A="255" R="255" G="255" B="255" /> 147 <CColor A="255" R="255" G="255" B="255" />
148 <PrePosition X="0.9166" Y="0.9283" /> 148 <PrePosition X="0.9166" Y="0.9283" />
......
...@@ -28,53 +28,53 @@ ...@@ -28,53 +28,53 @@
28 <FileData Type="Normal" Path="icon/default.png" Plist="" /> 28 <FileData Type="Normal" Path="icon/default.png" Plist="" />
29 <BlendFunc Src="1" Dst="771" /> 29 <BlendFunc Src="1" Dst="771" />
30 </AbstractNodeData> 30 </AbstractNodeData>
31 <AbstractNodeData Name="img_attack" ActionTag="-933199261" Tag="68" IconVisible="False" LeftMargin="-71.6435" RightMargin="223.6435" TopMargin="222.3596" BottomMargin="-46.3596" ctype="SpriteObjectData"> 31 <AbstractNodeData Name="img_attack" ActionTag="-933199261" Tag="68" IconVisible="False" LeftMargin="-89.2107" RightMargin="204.2107" TopMargin="201.1160" BottomMargin="-62.1160" ctype="SpriteObjectData">
32 <Size X="34.0000" Y="34.0000" /> 32 <Size X="71.0000" Y="71.0000" />
33 <Children> 33 <Children>
34 <AbstractNodeData Name="txt" ActionTag="1966898982" Tag="71" IconVisible="False" LeftMargin="2.5000" RightMargin="6.5000" TopMargin="6.5000" BottomMargin="2.5000" FontSize="18" LabelText="55" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 34 <AbstractNodeData Name="txt" ActionTag="1966898982" Tag="71" IconVisible="False" LeftMargin="16.3559" RightMargin="18.6441" TopMargin="11.2333" BottomMargin="22.7667" FontSize="28" LabelText="55" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
35 <Size X="25.0000" Y="25.0000" /> 35 <Size X="36.0000" Y="37.0000" />
36 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 36 <AnchorPoint ScaleX="0.5576" ScaleY="0.4509" />
37 <Position X="15.0000" Y="15.0000" /> 37 <Position X="36.4297" Y="39.4518" />
38 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 38 <Scale ScaleX="1.0000" ScaleY="1.0000" />
39 <CColor A="255" R="242" G="151" B="44" /> 39 <CColor A="255" R="255" G="255" B="255" />
40 <PrePosition X="0.4412" Y="0.4412" /> 40 <PrePosition X="0.5131" Y="0.5557" />
41 <PreSize X="0.7353" Y="0.7353" /> 41 <PreSize X="0.4789" Y="0.4648" />
42 <FontResource Type="Normal" Path="" Plist="" /> 42 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
43 <OutlineColor A="255" R="255" G="255" B="255" /> 43 <OutlineColor A="255" R="30" G="144" B="255" />
44 <ShadowColor A="255" R="110" G="110" B="110" /> 44 <ShadowColor A="255" R="110" G="110" B="110" />
45 </AbstractNodeData> 45 </AbstractNodeData>
46 </Children> 46 </Children>
47 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 47 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
48 <Position X="-54.6435" Y="-29.3596" /> 48 <Position X="-53.7107" Y="-26.6160" />
49 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 49 <Scale ScaleX="0.6000" ScaleY="0.6000" />
50 <CColor A="255" R="255" G="255" B="255" /> 50 <CColor A="255" R="255" G="255" B="255" />
51 <PrePosition X="-0.2938" Y="-0.1398" /> 51 <PrePosition X="-0.2888" Y="-0.1267" />
52 <PreSize X="0.1828" Y="0.1619" /> 52 <PreSize X="0.3817" Y="0.3381" />
53 <FileData Type="Normal" Path="ui/pet/img_attack.png" Plist="" /> 53 <FileData Type="Normal" Path="ui/pet/img_attack.png" Plist="" />
54 <BlendFunc Src="1" Dst="771" /> 54 <BlendFunc Src="1" Dst="771" />
55 </AbstractNodeData> 55 </AbstractNodeData>
56 <AbstractNodeData Name="img_hp" ActionTag="1010896503" Tag="69" IconVisible="False" LeftMargin="40.8256" RightMargin="113.1744" TopMargin="226.3597" BottomMargin="-46.3597" ctype="SpriteObjectData"> 56 <AbstractNodeData Name="img_hp" ActionTag="1010896503" Tag="69" IconVisible="False" LeftMargin="23.5728" RightMargin="100.4272" TopMargin="199.1875" BottomMargin="-60.1875" ctype="SpriteObjectData">
57 <Size X="32.0000" Y="30.0000" /> 57 <Size X="62.0000" Y="71.0000" />
58 <Children> 58 <Children>
59 <AbstractNodeData Name="txt" ActionTag="-1823918073" Tag="70" IconVisible="False" LeftMargin="3.5000" RightMargin="5.5000" TopMargin="4.5000" BottomMargin="4.5000" FontSize="18" LabelText="55" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 59 <AbstractNodeData Name="txt" ActionTag="-1823918073" Tag="70" IconVisible="False" LeftMargin="12.4552" RightMargin="14.5448" TopMargin="16.1149" BottomMargin="19.8851" FontSize="28" LabelText="55" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
60 <Size X="23.0000" Y="21.0000" /> 60 <Size X="35.0000" Y="35.0000" />
61 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 61 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
62 <Position X="15.0000" Y="15.0000" /> 62 <Position X="29.9552" Y="37.3851" />
63 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 63 <Scale ScaleX="1.0000" ScaleY="1.0000" />
64 <CColor A="255" R="255" G="255" B="255" /> 64 <CColor A="255" R="255" G="255" B="255" />
65 <PrePosition X="0.4688" Y="0.5000" /> 65 <PrePosition X="0.4831" Y="0.5266" />
66 <PreSize X="0.7188" Y="0.7000" /> 66 <PreSize X="0.5484" Y="0.4648" />
67 <FontResource Type="Normal" Path="" Plist="" /> 67 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
68 <OutlineColor A="255" R="255" G="0" B="0" /> 68 <OutlineColor A="255" R="255" G="0" B="0" />
69 <ShadowColor A="255" R="110" G="110" B="110" /> 69 <ShadowColor A="255" R="110" G="110" B="110" />
70 </AbstractNodeData> 70 </AbstractNodeData>
71 </Children> 71 </Children>
72 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 72 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
73 <Position X="56.8256" Y="-31.3597" /> 73 <Position X="54.5728" Y="-24.6875" />
74 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 74 <Scale ScaleX="0.7000" ScaleY="0.7000" />
75 <CColor A="255" R="255" G="255" B="255" /> 75 <CColor A="255" R="255" G="255" B="255" />
76 <PrePosition X="0.3055" Y="-0.1493" /> 76 <PrePosition X="0.2934" Y="-0.1176" />
77 <PreSize X="0.1720" Y="0.1429" /> 77 <PreSize X="0.3333" Y="0.3381" />
78 <FileData Type="Normal" Path="ui/pet/img_life.png" Plist="" /> 78 <FileData Type="Normal" Path="ui/pet/img_life.png" Plist="" />
79 <BlendFunc Src="1" Dst="771" /> 79 <BlendFunc Src="1" Dst="771" />
80 </AbstractNodeData> 80 </AbstractNodeData>
...@@ -89,18 +89,17 @@ ...@@ -89,18 +89,17 @@
89 <FileData Type="Normal" Path="pet/attr_1.png" Plist="" /> 89 <FileData Type="Normal" Path="pet/attr_1.png" Plist="" />
90 <BlendFunc Src="1" Dst="771" /> 90 <BlendFunc Src="1" Dst="771" />
91 </AbstractNodeData> 91 </AbstractNodeData>
92 <AbstractNodeData Name="pet_lv" ActionTag="-2130784969" Tag="83" IconVisible="False" LeftMargin="-87.7109" RightMargin="217.7109" TopMargin="110.2682" BottomMargin="65.7318" ctype="SpriteObjectData"> 92 <AbstractNodeData Name="pet_lv" ActionTag="-2130784969" Tag="83" IconVisible="False" LeftMargin="-87.7109" RightMargin="217.7109" TopMargin="110.7682" BottomMargin="66.2318" ctype="SpriteObjectData">
93 <Size X="56.0000" Y="34.0000" /> 93 <Size X="56.0000" Y="33.0000" />
94 <Children> 94 <Children>
95 <AbstractNodeData Name="txt" ActionTag="-1194171393" Tag="84" IconVisible="False" LeftMargin="5.3652" RightMargin="4.6348" TopMargin="3.7216" BottomMargin="6.2784" FontSize="20" LabelText="MAX" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 95 <AbstractNodeData Name="txt" ActionTag="-1194171393" Tag="84" IconVisible="False" LeftMargin="13.3652" RightMargin="12.6348" TopMargin="4.7216" BottomMargin="8.2784" FontSize="20" LabelText="MAX" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
96 <Size X="46.0000" Y="24.0000" /> 96 <Size X="30.0000" Y="20.0000" />
97 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 97 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
98 <Position X="28.3652" Y="18.2784" /> 98 <Position X="28.3652" Y="18.2784" />
99 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 99 <Scale ScaleX="1.0000" ScaleY="1.0000" />
100 <CColor A="255" R="255" G="255" B="255" /> 100 <CColor A="255" R="255" G="255" B="255" />
101 <PrePosition X="0.5065" Y="0.5376" /> 101 <PrePosition X="0.5065" Y="0.5539" />
102 <PreSize X="0.8214" Y="0.7059" /> 102 <PreSize X="0.5357" Y="0.6061" />
103 <FontResource Type="Normal" Path="" Plist="" />
104 <OutlineColor A="255" R="255" G="0" B="0" /> 103 <OutlineColor A="255" R="255" G="0" B="0" />
105 <ShadowColor A="255" R="110" G="110" B="110" /> 104 <ShadowColor A="255" R="110" G="110" B="110" />
106 </AbstractNodeData> 105 </AbstractNodeData>
...@@ -110,7 +109,7 @@ ...@@ -110,7 +109,7 @@
110 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 109 <Scale ScaleX="1.0000" ScaleY="1.0000" />
111 <CColor A="255" R="255" G="255" B="255" /> 110 <CColor A="255" R="255" G="255" B="255" />
112 <PrePosition X="-0.3210" Y="0.3940" /> 111 <PrePosition X="-0.3210" Y="0.3940" />
113 <PreSize X="0.3011" Y="0.1619" /> 112 <PreSize X="0.3011" Y="0.1571" />
114 <FileData Type="Normal" Path="ui/dress/bg_pet_lv.png" Plist="" /> 113 <FileData Type="Normal" Path="ui/dress/bg_pet_lv.png" Plist="" />
115 <BlendFunc Src="1" Dst="771" /> 114 <BlendFunc Src="1" Dst="771" />
116 </AbstractNodeData> 115 </AbstractNodeData>
......
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="-26.5663" />
7 </HorizontalList>
8 </Value>
5 </Item> 9 </Item>
6 </Properties> 10 </Properties>
7 </UserData> 11 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -56,53 +56,53 @@ ...@@ -56,53 +56,53 @@
56 <FileData Type="Normal" Path="icon/default.png" Plist="" /> 56 <FileData Type="Normal" Path="icon/default.png" Plist="" />
57 <BlendFunc Src="1" Dst="771" /> 57 <BlendFunc Src="1" Dst="771" />
58 </AbstractNodeData> 58 </AbstractNodeData>
59 <AbstractNodeData Name="img_attack" ActionTag="-933199261" Tag="68" IconVisible="False" LeftMargin="21.2321" RightMargin="130.7679" TopMargin="118.4429" BottomMargin="57.5571" ctype="SpriteObjectData"> 59 <AbstractNodeData Name="img_attack" ActionTag="-933199261" Tag="68" IconVisible="False" LeftMargin="2.7321" RightMargin="112.2679" TopMargin="99.4578" BottomMargin="39.5422" ctype="SpriteObjectData">
60 <Size X="34.0000" Y="34.0000" /> 60 <Size X="71.0000" Y="71.0000" />
61 <Children> 61 <Children>
62 <AbstractNodeData Name="txt" ActionTag="1966898982" Tag="71" IconVisible="False" LeftMargin="2.5000" RightMargin="6.5000" TopMargin="6.5000" BottomMargin="2.5000" FontSize="18" LabelText="55" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 62 <AbstractNodeData Name="txt" ActionTag="1966898982" Tag="71" IconVisible="False" LeftMargin="18.8729" RightMargin="18.1271" TopMargin="18.6272" BottomMargin="19.3728" FontSize="28" LabelText="55" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
63 <Size X="25.0000" Y="25.0000" /> 63 <Size X="36.0000" Y="37.0000" />
64 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 64 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
65 <Position X="15.0000" Y="15.0000" /> 65 <Position X="35.8729" Y="35.8728" />
66 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 66 <Scale ScaleX="1.0000" ScaleY="1.0000" />
67 <CColor A="255" R="242" G="151" B="44" /> 67 <CColor A="255" R="255" G="255" B="255" />
68 <PrePosition X="0.4412" Y="0.4412" /> 68 <PrePosition X="0.5053" Y="0.5053" />
69 <PreSize X="0.7353" Y="0.7353" /> 69 <PreSize X="0.4789" Y="0.4648" />
70 <FontResource Type="Normal" Path="" Plist="" /> 70 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
71 <OutlineColor A="255" R="255" G="255" B="255" /> 71 <OutlineColor A="255" R="30" G="144" B="255" />
72 <ShadowColor A="255" R="110" G="110" B="110" /> 72 <ShadowColor A="255" R="110" G="110" B="110" />
73 </AbstractNodeData> 73 </AbstractNodeData>
74 </Children> 74 </Children>
75 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 75 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
76 <Position X="38.2321" Y="74.5571" /> 76 <Position X="38.2321" Y="75.0422" />
77 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 77 <Scale ScaleX="0.5000" ScaleY="0.5000" />
78 <CColor A="255" R="255" G="255" B="255" /> 78 <CColor A="255" R="255" G="255" B="255" />
79 <PrePosition X="0.2055" Y="0.3550" /> 79 <PrePosition X="0.2055" Y="0.3573" />
80 <PreSize X="0.1828" Y="0.1619" /> 80 <PreSize X="0.3817" Y="0.3381" />
81 <FileData Type="Normal" Path="ui/pet/img_attack.png" Plist="" /> 81 <FileData Type="Normal" Path="ui/pet/img_attack.png" Plist="" />
82 <BlendFunc Src="1" Dst="771" /> 82 <BlendFunc Src="1" Dst="771" />
83 </AbstractNodeData> 83 </AbstractNodeData>
84 <AbstractNodeData Name="img_hp" ActionTag="1010896503" Tag="69" IconVisible="False" LeftMargin="133.7024" RightMargin="20.2976" TopMargin="122.4429" BottomMargin="57.5571" ctype="SpriteObjectData"> 84 <AbstractNodeData Name="img_hp" ActionTag="1010896503" Tag="69" IconVisible="False" LeftMargin="119.7023" RightMargin="4.2977" TopMargin="99.9429" BottomMargin="39.0571" ctype="SpriteObjectData">
85 <Size X="32.0000" Y="30.0000" /> 85 <Size X="62.0000" Y="71.0000" />
86 <Children> 86 <Children>
87 <AbstractNodeData Name="txt" ActionTag="-1823918073" Tag="70" IconVisible="False" LeftMargin="3.5000" RightMargin="5.5000" TopMargin="4.5000" BottomMargin="4.5000" FontSize="18" LabelText="55" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 87 <AbstractNodeData Name="txt" ActionTag="-1823918073" Tag="70" IconVisible="False" LeftMargin="13.8274" RightMargin="12.1726" TopMargin="17.8679" BottomMargin="16.1321" FontSize="28" LabelText="55" OutlineSize="2" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
88 <Size X="23.0000" Y="21.0000" /> 88 <Size X="36.0000" Y="37.0000" />
89 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 89 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
90 <Position X="15.0000" Y="15.0000" /> 90 <Position X="31.8274" Y="34.6321" />
91 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 91 <Scale ScaleX="1.0000" ScaleY="1.0000" />
92 <CColor A="255" R="255" G="255" B="255" /> 92 <CColor A="255" R="255" G="255" B="255" />
93 <PrePosition X="0.4688" Y="0.5000" /> 93 <PrePosition X="0.5133" Y="0.4878" />
94 <PreSize X="0.7188" Y="0.7000" /> 94 <PreSize X="0.5484" Y="0.4648" />
95 <FontResource Type="Normal" Path="" Plist="" /> 95 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
96 <OutlineColor A="255" R="255" G="0" B="0" /> 96 <OutlineColor A="255" R="255" G="0" B="0" />
97 <ShadowColor A="255" R="110" G="110" B="110" /> 97 <ShadowColor A="255" R="110" G="110" B="110" />
98 </AbstractNodeData> 98 </AbstractNodeData>
99 </Children> 99 </Children>
100 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 100 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
101 <Position X="149.7024" Y="72.5571" /> 101 <Position X="150.7023" Y="74.5571" />
102 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 102 <Scale ScaleX="0.6000" ScaleY="0.6000" />
103 <CColor A="255" R="255" G="255" B="255" /> 103 <CColor A="255" R="255" G="255" B="255" />
104 <PrePosition X="0.8049" Y="0.3455" /> 104 <PrePosition X="0.8102" Y="0.3550" />
105 <PreSize X="0.1720" Y="0.1429" /> 105 <PreSize X="0.3333" Y="0.3381" />
106 <FileData Type="Normal" Path="ui/pet/img_life.png" Plist="" /> 106 <FileData Type="Normal" Path="ui/pet/img_life.png" Plist="" />
107 <BlendFunc Src="1" Dst="771" /> 107 <BlendFunc Src="1" Dst="771" />
108 </AbstractNodeData> 108 </AbstractNodeData>
...@@ -117,18 +117,17 @@ ...@@ -117,18 +117,17 @@
117 <FileData Type="Normal" Path="pet/attr_1.png" Plist="" /> 117 <FileData Type="Normal" Path="pet/attr_1.png" Plist="" />
118 <BlendFunc Src="1" Dst="771" /> 118 <BlendFunc Src="1" Dst="771" />
119 </AbstractNodeData> 119 </AbstractNodeData>
120 <AbstractNodeData Name="pet_lv" ActionTag="-2130784969" Tag="83" IconVisible="False" LeftMargin="5.0819" RightMargin="124.9181" TopMargin="5.3519" BottomMargin="170.6481" ctype="SpriteObjectData"> 120 <AbstractNodeData Name="pet_lv" ActionTag="-2130784969" Tag="83" IconVisible="False" LeftMargin="5.0819" RightMargin="124.9181" TopMargin="5.8519" BottomMargin="171.1481" ctype="SpriteObjectData">
121 <Size X="56.0000" Y="34.0000" /> 121 <Size X="56.0000" Y="33.0000" />
122 <Children> 122 <Children>
123 <AbstractNodeData Name="txt" ActionTag="-1194171393" Tag="84" IconVisible="False" LeftMargin="5.3652" RightMargin="4.6348" TopMargin="3.7216" BottomMargin="6.2784" FontSize="20" LabelText="MAX" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 123 <AbstractNodeData Name="txt" ActionTag="-1194171393" Tag="84" IconVisible="False" LeftMargin="13.3652" RightMargin="12.6348" TopMargin="4.7216" BottomMargin="8.2784" FontSize="20" LabelText="MAX" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
124 <Size X="46.0000" Y="24.0000" /> 124 <Size X="30.0000" Y="20.0000" />
125 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 125 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
126 <Position X="28.3652" Y="18.2784" /> 126 <Position X="28.3652" Y="18.2784" />
127 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 127 <Scale ScaleX="1.0000" ScaleY="1.0000" />
128 <CColor A="255" R="255" G="255" B="255" /> 128 <CColor A="255" R="255" G="255" B="255" />
129 <PrePosition X="0.5065" Y="0.5376" /> 129 <PrePosition X="0.5065" Y="0.5539" />
130 <PreSize X="0.8214" Y="0.7059" /> 130 <PreSize X="0.5357" Y="0.6061" />
131 <FontResource Type="Normal" Path="" Plist="" />
132 <OutlineColor A="255" R="255" G="0" B="0" /> 131 <OutlineColor A="255" R="255" G="0" B="0" />
133 <ShadowColor A="255" R="110" G="110" B="110" /> 132 <ShadowColor A="255" R="110" G="110" B="110" />
134 </AbstractNodeData> 133 </AbstractNodeData>
...@@ -138,7 +137,7 @@ ...@@ -138,7 +137,7 @@
138 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 137 <Scale ScaleX="1.0000" ScaleY="1.0000" />
139 <CColor A="255" R="255" G="255" B="255" /> 138 <CColor A="255" R="255" G="255" B="255" />
140 <PrePosition X="0.1779" Y="0.8936" /> 139 <PrePosition X="0.1779" Y="0.8936" />
141 <PreSize X="0.3011" Y="0.1619" /> 140 <PreSize X="0.3011" Y="0.1571" />
142 <FileData Type="Normal" Path="ui/dress/bg_pet_lv.png" Plist="" /> 141 <FileData Type="Normal" Path="ui/dress/bg_pet_lv.png" Plist="" />
143 <BlendFunc Src="1" Dst="771" /> 142 <BlendFunc Src="1" Dst="771" />
144 </AbstractNodeData> 143 </AbstractNodeData>
...@@ -167,15 +166,14 @@ ...@@ -167,15 +166,14 @@
167 <AbstractNodeData Name="pet_no" ActionTag="-1029861376" Tag="157" IconVisible="False" LeftMargin="74.6418" RightMargin="75.3582" TopMargin="80.6619" BottomMargin="93.3381" ctype="SpriteObjectData"> 166 <AbstractNodeData Name="pet_no" ActionTag="-1029861376" Tag="157" IconVisible="False" LeftMargin="74.6418" RightMargin="75.3582" TopMargin="80.6619" BottomMargin="93.3381" ctype="SpriteObjectData">
168 <Size X="36.0000" Y="36.0000" /> 167 <Size X="36.0000" Y="36.0000" />
169 <Children> 168 <Children>
170 <AbstractNodeData Name="txt" ActionTag="-1068506448" Tag="158" IconVisible="False" LeftMargin="7.2622" RightMargin="9.7378" TopMargin="0.1705" BottomMargin="0.8295" FontSize="30" LabelText="3" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData"> 169 <AbstractNodeData Name="txt" ActionTag="-1068506448" Tag="158" IconVisible="False" LeftMargin="9.2622" RightMargin="11.7378" TopMargin="2.6705" BottomMargin="3.3295" FontSize="30" LabelText="3" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
171 <Size X="19.0000" Y="35.0000" /> 170 <Size X="15.0000" Y="30.0000" />
172 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" /> 171 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
173 <Position X="16.7622" Y="18.3295" /> 172 <Position X="16.7622" Y="18.3295" />
174 <Scale ScaleX="1.0000" ScaleY="1.0000" /> 173 <Scale ScaleX="1.0000" ScaleY="1.0000" />
175 <CColor A="255" R="255" G="255" B="255" /> 174 <CColor A="255" R="255" G="255" B="255" />
176 <PrePosition X="0.4656" Y="0.5092" /> 175 <PrePosition X="0.4656" Y="0.5092" />
177 <PreSize X="0.5278" Y="0.9722" /> 176 <PreSize X="0.4167" Y="0.8333" />
178 <FontResource Type="Normal" Path="" Plist="" />
179 <OutlineColor A="255" R="255" G="0" B="0" /> 177 <OutlineColor A="255" R="255" G="0" B="0" />
180 <ShadowColor A="255" R="110" G="110" B="110" /> 178 <ShadowColor A="255" R="110" G="110" B="110" />
181 </AbstractNodeData> 179 </AbstractNodeData>
......

1.6 KB | W: | H:

3.19 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.56 KB | W: | H:

2.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 <UserData Version="3.10.0.0"> 1 <UserData Version="3.10.0.0">
2 <Properties> 2 <Properties>
3 <Item Key="GuidesList"> 3 <Item Key="GuidesList">
4 <Value ctype="GuidesData" /> 4 <Value ctype="GuidesData">
5 <HorizontalList>
6 <Guides Direction="Horizontal" Position="110.9827" />
7 </HorizontalList>
8 <VerticalList>
9 <Guides Position="639.4063" />
10 </VerticalList>
11 </Value>
5 </Item> 12 </Item>
6 </Properties> 13 </Properties>
7 </UserData> 14 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 <Image Name="btn_back_2.png" /> 46 <Image Name="btn_back_2.png" />
47 <Image Name="btn_back_cj.png" /> 47 <Image Name="btn_back_cj.png" />
48 <Image Name="btn_back_cwy.png" /> 48 <Image Name="btn_back_cwy.png" />
49 <Image Name="btn_common_pop_close.png" />
49 <Image Name="btn_green.png" /> 50 <Image Name="btn_green.png" />
50 <Image Name="btn_green_s.png" /> 51 <Image Name="btn_green_s.png" />
51 <Image Name="btn_green02.png" /> 52 <Image Name="btn_green02.png" />
...@@ -1479,6 +1480,10 @@ ...@@ -1479,6 +1480,10 @@
1479 <Image Name="img_xyx_6.png" /> 1480 <Image Name="img_xyx_6.png" />
1480 <Image Name="img_xyx_7.png" /> 1481 <Image Name="img_xyx_7.png" />
1481 <Image Name="img_xyx_8.png" /> 1482 <Image Name="img_xyx_8.png" />
1483 <Image Name="img_xyx_buy_1.png" />
1484 <Image Name="img_xyx_buy_2.png" />
1485 <Image Name="img_xyx_buy_3.png" />
1486 <Image Name="img_xyx_buy_4.png" />
1482 <Image Name="img_xyx_jiangli.png" /> 1487 <Image Name="img_xyx_jiangli.png" />
1483 <Image Name="title_pk_fail.png" /> 1488 <Image Name="title_pk_fail.png" />
1484 <Image Name="title_pk_success.png" /> 1489 <Image Name="title_pk_success.png" />
......
...@@ -28,14 +28,5 @@ ...@@ -28,14 +28,5 @@
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/task/TaskLayer.csd" />
35 <FilePathData Path="ui/sign/SignLayer.csd" />
36 </OpenedDocuments>
37 <ActiveDocument Path="ui/sign/SignLayer.csd" />
38 </Value>
39 </Item>
40 </Properties> 31 </Properties>
41 </UserData> 32 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......