Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b0c4be4d b0c4be4d8a41fbc0b8eef67bf1615be153ed2471 by jinwawa
Options

0604

1 parent 401b0fe1
Expand all
Inline Side-by-side
Showing 34 changed files with 365 additions and 26 deletions
No preview for this file type
......@@ -120,6 +120,53 @@
<shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
<shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
<shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
<shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
<shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
<shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
<shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
<shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
<shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
<shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
<shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
<shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
<shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
<shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
<shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
<shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
<shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
<shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
<shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
<shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
......
No preview for this file type
......@@ -120,6 +120,53 @@
<shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
<shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
<shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
<shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
<shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
<shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
<shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
<shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
<shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
<shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
<shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
<shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
<shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
<shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
<shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
<shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
<shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
<shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
<shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
<shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
......
No preview for this file type
......@@ -41,6 +41,6 @@
<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/>
<pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/>
<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020@207" productPuTao="qjqp999" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
</platform>
</root>
\ No newline at end of file
......
......@@ -120,6 +120,53 @@
<shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
<shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
<shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
<shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
<shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
<shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
<shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
<shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
<shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
<shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
<shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
<shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
<shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
<shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
<shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
<shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
<shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
<shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
<shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
<shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
......
......@@ -3,7 +3,7 @@
<!--m0800279afc6c-->
<!--m0800278b87c2-->
<!---->
<Account>m0800278b87c7</Account>
<Account>m0800278b87c8</Account>
<exp>0</exp>
<versionnum>201801291657</versionnum>
<isMusic>0</isMusic>
......@@ -26,7 +26,7 @@
<new_guide_step>4</new_guide_step>
<is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
<feiyanzoubi_best>376</feiyanzoubi_best>
<uid>1030100010142918</uid>
<uid>1030100010142892</uid>
<is_bird_game_guide>1</is_bird_game_guide>
<bird_best>1008</bird_best>
<is_haidao_game_guide>1</is_haidao_game_guide>
......
xcopy %cd%\res E:\AndroidProject\XhxAndroid_cucc\assets\res /E/I/Y
cocos luacompile -s %cd%\src -d E:\AndroidProject\XhxAndroid_cucc\assets\src -e -k tpdrawgdanjue -b tpdrawgd
xcopy %cd%\res D:\AndroidProject\XhxAndroid_cucc\assets\res /E/I/Y
cocos luacompile -s %cd%\src -d D:\AndroidProject\XhxAndroid_cucc\assets\src -e -k tpdrawgdanjue -b tpdrawgd
call xcopy %cd%\src E:\AndroidProject\XhxAndroid_cucc\assets\src /E/I/Y
\ No newline at end of file
call xcopy %cd%\src D:\AndroidProject\XhxAndroid_cucc\assets\src /E/I/Y
\ No newline at end of file
......
......@@ -125,6 +125,51 @@ id name describe icon shopID amount type add_pet_exp pet_star unique vip
800225 萌天使缎丝鞋 萌天使缎丝鞋 0 0 0 5 0 0 1 1
800226 萌天使翅膀 萌天使翅膀 0 0 0 6 0 0 1 1
800227 萌天使手摇铃 萌天使手摇铃 0 0 0 7 0 0 1 1
800231 粉小猫创可贴 粉小猫创可贴 0 0 0 1 0 0 1 0
800232 粉小猫发型 粉小猫发型 0 0 0 2 0 0 1 0
800233 粉小猫上衣 粉小猫上衣 0 0 0 3 0 0 1 0
800235 粉小猫鞋子 粉小猫鞋子 0 0 0 5 0 0 1 0
800236 天女散花 天女散花 0 0 0 6 0 0 1 0
800237 粉小猫手链 粉小猫手链 0 0 0 7 0 0 1 0
800241 新春虎头吉祥痣 新春虎头吉祥痣 0 0 0 1 0 0 1 0
800242 新春虎头头套 新春虎头帽 0 0 0 2 0 0 1 0
800243 新春虎头上衣 新春虎头衣 0 0 0 3 0 0 1 0
800244 新春虎头裤 新春虎头裤 0 0 0 4 0 0 1 0
800245 新春虎头鞋 新春虎头鞋 0 0 0 5 0 0 1 0
800246 新春虎头尾 新春虎头尾 0 0 0 6 0 0 1 0
800247 春节鞭炮 新春虎头鞭炮 0 0 0 7 0 0 1 0
800252 樱花妹发型 樱花妹发型 0 0 0 2 0 0 1 0
800253 樱花妹服 樱花妹服 0 0 0 3 0 0 1 0
800255 樱花妹鞋 樱花妹鞋 0 0 0 5 0 0 1 0
800256 樱花妹背景 樱花妹背景 0 0 0 6 0 0 1 0
800257 樱花妹伞 樱花妹伞 0 0 0 7 0 0 1 0
800262 小飞侠发型 小飞侠发型 0 0 0 2 0 0 1 0
800263 小飞侠上衣 小飞侠上衣 0 0 0 3 0 0 1 0
800264 小飞侠裤子 小飞侠裤子 0 0 0 4 0 0 1 0
800265 小飞侠鞋 小飞侠鞋 0 0 0 5 0 0 1 0
800266 小飞侠翅膀 小飞侠翅膀 0 0 0 6 0 0 1 0
800267 小飞侠玩具 小飞侠玩具 0 0 0 7 0 0 1 0
800271 原始人面饰 原始人面饰 0 0 0 1 0 0 1 0
800272 原始人发型 原始人发型 0 0 0 2 0 0 1 0
800273 原始人服饰 原始人服饰 0 0 0 3 0 0 1 0
800275 原始人鞋 原始人鞋 0 0 0 5 0 0 1 0
800277 原始人棒槌 原始人棒槌 0 0 0 7 0 0 1 0
800282 宇航员发型 宇航员发型 0 0 0 2 0 0 1 0
800283 宇航员上衣 宇航员上衣 0 0 0 3 0 0 1 0
800284 宇航员裤 宇航员裤 0 0 0 4 0 0 1 0
800285 宇航员鞋 宇航员鞋 0 0 0 5 0 0 1 0
800291 福尔摩斯面饰 福尔摩斯面饰 0 0 0 1 0 0 1 0
800292 福尔摩斯发型 福尔摩斯发型 0 0 0 2 0 0 1 0
800293 福尔摩斯上衣 福尔摩斯上衣 0 0 0 3 0 0 1 0
800294 福尔摩斯裤 福尔摩斯裤 0 0 0 4 0 0 1 0
800295 福尔摩斯鞋 福尔摩斯鞋 0 0 0 5 0 0 1 0
800297 福尔摩斯放大镜 福尔摩斯放大镜 0 0 0 7 0 0 1 0
800301 剑侠客面饰 剑侠客面饰 0 0 0 1 0 0 1 0
800302 剑侠客发型 剑侠客发型 0 0 0 2 0 0 1 0
800303 剑侠客上衣 剑侠客上衣 0 0 0 3 0 0 1 0
800304 剑侠客裤 剑侠客裤 0 0 0 4 0 0 1 0
800305 剑侠客鞋 剑侠客鞋 0 0 0 5 0 0 1 0
800307 剑侠客武器 剑侠客武器 0 0 0 7 0 0 1 0
800901 时尚太阳镜 时尚太阳镜 0 0 0 1 0 0 1 0
800906 优雅蝶翼 优雅蝶翼 0 0 0 6 0 0 1 0
910001 爱心奖牌 爱心奖牌 1 0 0 0 0 0 1 0
......
......@@ -41,6 +41,6 @@
<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/>
<pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/>
<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020@207" productPuTao="qjqp999" notice="1"/>
<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/>
</platform>
</root>
\ No newline at end of file
......
......@@ -6,4 +6,4 @@ id reward
4 800033,1
5 800901,1
6 800906,1
7 200002,1
7 200002,1
\ No newline at end of file
......
......@@ -120,6 +120,53 @@
<shop id="3098" buy="800225,1" price="100001,400" des="400金币" extra="0" />
<shop id="3099" buy="800226,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3100" buy="800227,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3101" buy="800231,1" price="100001,600" des="600金币" extra="0" />
<shop id="3102" buy="800232,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3103" buy="800233,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3104" buy="800235,1" price="100001,400" des="400金币" extra="0" />
<shop id="3105" buy="800236,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3106" buy="800237,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3107" buy="800241,1" price="100001,600" des="600金币" extra="0" />
<shop id="3108" buy="800242,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3109" buy="800243,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3110" buy="800244,1" price="100001,600" des="600金币" extra="0" />
<shop id="3111" buy="800245,1" price="100001,400" des="400金币" extra="0" />
<shop id="3112" buy="800246,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3113" buy="800247,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3114" buy="800252,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3115" buy="800253,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3116" buy="800255,1" price="100001,400" des="400金币" extra="0" />
<shop id="3117" buy="800256,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3118" buy="800257,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3119" buy="800262,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3120" buy="800263,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3121" buy="800264,1" price="100001,600" des="600金币" extra="0" />
<shop id="3122" buy="800265,1" price="100001,400" des="400金币" extra="0" />
<shop id="3123" buy="800266,1" price="100001,3000" des="3000金币" extra="0" />
<shop id="3124" buy="800267,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3125" buy="800271,1" price="100001,600" des="600金币" extra="0" />
<shop id="3126" buy="800272,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3127" buy="800273,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3128" buy="800275,1" price="100001,400" des="400金币" extra="0" />
<shop id="3129" buy="800277,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3130" buy="800282,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3131" buy="800283,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3132" buy="800284,1" price="100001,600" des="600金币" extra="0" />
<shop id="3133" buy="800285,1" price="100001,400" des="400金币" extra="0" />
<shop id="3134" buy="800291,1" price="100001,600" des="600金币" extra="0" />
<shop id="3135" buy="800292,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3136" buy="800293,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3137" buy="800294,1" price="100001,600" des="600金币" extra="0" />
<shop id="3138" buy="800295,1" price="100001,400" des="400金币" extra="0" />
<shop id="3139" buy="800297,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3140" buy="800301,1" price="100001,600" des="600金币" extra="0" />
<shop id="3141" buy="800302,1" price="100001,1500" des="1500金币" extra="0" />
<shop id="3142" buy="800303,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="3143" buy="800304,1" price="100001,600" des="600金币" extra="0" />
<shop id="3144" buy="800305,1" price="100001,400" des="400金币" extra="0" />
<shop id="3145" buy="800307,1" price="100001,1200" des="1200金币" extra="0" />
<shop id="4000" buy="910003,1" price="100001,300" des="300金币" extra="0" />
......
......@@ -12,7 +12,7 @@ local shopList_5 = {}; --墙纸
local shopList_6 = {}; --商店宠物
local shopList_7 = {}; --商店宠物钥匙
local vipList = {}; --月卡
local vipList = {}; --{月卡，年卡，自动续包月卡}
local firstPayList = {}; --首充礼包
local dailyPayList = {}; --每日充值
local cyclePayList = {}; --周期活动
......@@ -94,6 +94,7 @@ local function init()
local info = {};
info.id = tonumber(vv.attr.id);
info.name = vv.attr.name;
logD("ShopInfo---------------------->"..info.name);
info.rmb = tonumber(vv.attr.rmb);
info.type = tonumber(vv.attr.type);
info.itemList = {};
......@@ -123,6 +124,7 @@ local function init()
local arr = StringUtil.split(vv.attr.payitem,",");
info.payItemInfo = {id=tonumber(arr[1]),num=tonumber(arr[2])};
vipList[#vipList+1] = info;
dump(vipList);
elseif info.type == 3 then
info.worth = vv.attr.worth;
......@@ -144,6 +146,7 @@ local function init()
end
end
end
logD("Shopinfo--------------------->vipList"..#vipList); --2
table.sort(firstPayList,function (aa,bb)
return aa.id<bb.id;
end);
......
......@@ -125,11 +125,22 @@ end
-- },timeoutFn);
--end
--根据config.ini中的CHANNEL字段判断
function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
if CHANNEL == "cucc" then
ShopModel.payCucc(productId,productName,productPrice,callBack,timeoutCallBack,gameid);
elseif CHANNEL == "dangbei" then
ShopModel.payDangbei(productId,productName,productPrice,callBack,timeoutCallBack,gameid);
end
end
--天津联通支付
function ShopModel.payCucc(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
local function onGetPayIDSuccessFun(_params)
local data = json.decode(_params);
if data.pay_id == "" then
Alert.showOne("获取订单号失败！");
--Alert.showOne("获取订单号失败！");
logUI("获取订单号失败！"..productId);
return;
end
local tradeNo = data.pay_id; --订单号
......@@ -188,4 +199,57 @@ function ShopModel.pay(productId,productName,productPrice,callBack,timeoutCallBa
end
end
--天津联通
function ShopModel.payDangbei(productId,productName,productPrice,callBack,timeoutCallBack,gameid)
local function onGetPayIDSuccessFun(_params)
local data = json.decode(_params);
if data.pay_id == "" then
Alert.showOne("获取订单号失败！");
return;
end
local tradeNo = data.pay_id; --订单号
local productId = productId; --商品ID
local subject = productName; --商品名称
local amount = productPrice; --商品价格
local notificationURL = data.url_callback;--回调URL
local zfb_url_callback = data.zfb_url_callback;--支付宝回调URL
local wx_url_callback = data.wx_url_callback;--微信回调URL
local peng_bo_shi_token = data.peng_bo_shi_token;--鹏博士密钥
logUI("订单号获取成功token："..peng_bo_shi_token);
local function callbackLua(params)
if params == "success" then
if callBack then
callBack(params);
end
elseif params == "no" then
local subject = DeviceUtil.getAppName().." "..productName;
local reciever = require("app.views.view.QrPayView"):show({trade_no=tradeNo,subject=subject,price=productPrice,zfb_url=zfb_url_callback,wx_url=wx_url_callback,callBackFun=callBack});
local scene = cc.Director:getInstance():getRunningScene();
scene.keypadManager:addKeypadReceiver(reciever);
end
logUI(params);
end
local pay_params = tradeNo..","..productId..","..subject..","..amount..","..notificationURL..","..peng_bo_shi_token;
DeviceUtil.sendBilling(pay_params,callbackLua);
end
local function onGetPayIDFaildFun(params)
if timeoutCallBack then
timeoutCallBack(params);
end
end
gameid = gameid or 0;
gameid = tostring(gameid);
local get_pay_id_url = string.gsub(GAME_LOGIN_URL,"login","pay_get_id");
if CHANNEL == "cmcc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
local paramsStr = "uid="..UserModel.getStringUID().."&product="..productId.."&account="..UserModel.account.."&gameid="..gameid;
DeviceUtil.sendHttpRequest("POST,"..get_pay_id_url..","..PROXY_HTTP_ADDR..","..paramsStr,onGetPayIDSuccessFun);
else
HttpRequest:getInstance():post(get_pay_id_url,{uid=UserModel.getStringUID(),product=productId,account=UserModel.account,gameid=gameid},onGetPayIDSuccessFun,onGetPayIDFaildFun);
end
end
return ShopModel
\ No newline at end of file
......
......@@ -143,7 +143,34 @@ function DeviceUtil.authPermission(params,callbackLua) --调用android的方法
--luaj.callStaticMethod() 会返回两个值
--当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
--当失败时，第一个值为 false，第二个值是错误代码
local ok,ret = luaj.callStaticMethod(className,"authPermission",args,sigs)
local ok,ret = luaj.callStaticMethod(className,"authPermission",args,sigs) --调用AppActivity.java代码
if not ok then
print("authPermission error:"..ret);
end
else
if callbackLua then
callbackLua("no");
end
end
end
--连续包月鉴权获取productId _jinwawa
function DeviceUtil.authPermissionForPruductId(params,callbackLua) --调用android的方法实现
print("DeviceUtil.authPermission:"..params);
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
if targetPlatform == cc.PLATFORM_OS_ANDROID then
local luaj = require "cocos.cocos2d.luaj" --引入luaj
--包名/类名 这个可以在对应的android工程的manifest中得到
local className="org/cocos2dx/lua/AppActivity";
local args = { tostring(params),callbackLua};
local sigs = "(Ljava/lang/String;I)V" --传入string参数，无返回值
--luaj 调用 Java 方法时，可能会出现各种错误，因此 luaj 提供了一种机制让 Lua 调用代码可以确定 Java 方法是否成功调用。
--luaj.callStaticMethod() 会返回两个值
--当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
--当失败时，第一个值为 false，第二个值是错误代码
logD("DeviceUtil----------------------->authPermissionProductId");
local ok,ret = luaj.callStaticMethod(className,"authPermissionForProductId",args,sigs) --调用AppActivity.java代码
if not ok then
print("authPermission error:"..ret);
end
......@@ -179,6 +206,7 @@ function DeviceUtil.sendBilling(params,callbackLua) --调用android的方法实
end
end
--周期性付款
function DeviceUtil.cycleBilling(params,callbackLua) --调用android的方法实现
print("DeviceUtil.cycleBilling:"..params);
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
......
......@@ -3,11 +3,11 @@
<Item Key="GuidesList">
<Value ctype="GuidesData">
<HorizontalList>
<Guides Direction="Horizontal" Position="-70.0094" />
<Guides Direction="Horizontal" Position="25.9645" />
</HorizontalList>
<VerticalList>
<Guides Position="-220.0244" />
<Guides Position="162.4259" />
<Guides Position="139.4012" />
<Guides Position="361.5789" />
<Guides Position="618.1532" />
</VerticalList>
......
......@@ -715,6 +715,19 @@
<OutlineColor A="255" R="255" G="0" B="0" />
<ShadowColor A="255" R="110" G="110" B="110" />
</AbstractNodeData>
<AbstractNodeData Name="panel_decorate_pet" Visible="False" ActionTag="-963401781" Tag="404" IconVisible="False" LeftMargin="-0.4424" RightMargin="0.4424" TopMargin="-0.0528" BottomMargin="0.0528" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint />
<Position X="-0.4424" Y="0.0528" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="-0.0003" Y="0.0001" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
<AbstractNodeData Name="txt_id" ActionTag="548091000" Tag="2421" IconVisible="False" LeftMargin="9.7859" RightMargin="1070.2141" TopMargin="424.5339" BottomMargin="245.4661" TouchEnable="True" FontSize="50" IsCustomSize="True" LabelText="100000" PlaceHolderText="" MaxLengthText="10" ctype="TextFieldObjectData">
<Size X="200.0000" Y="50.0000" />
<AnchorPoint ScaleY="0.5000" />
......@@ -818,19 +831,6 @@
<FileData Type="Normal" Path="ui/main/bg_tips_new_activity.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="panel_decorate_pet" Visible="False" ActionTag="-963401781" Tag="404" IconVisible="False" LeftMargin="-0.4424" RightMargin="0.4424" TopMargin="-0.0528" BottomMargin="0.0528" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint />
<Position X="-0.4424" Y="0.0528" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="-0.0003" Y="0.0001" />
<PreSize X="1.0000" Y="1.0000" />
<SingleColor A="255" R="150" G="200" B="255" />
<FirstColor A="255" R="150" G="200" B="255" />
<EndColor A="255" R="255" G="255" B="255" />
<ColorVector ScaleY="1.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
......
......@@ -833,7 +833,9 @@
<Image Name="achievement_yilingqu.png" />
<Image Name="act_vip_flag.png" />
<Image Name="activity_flag_limit.png" />
<Image Name="activity_gift_icon.png" />
<Image Name="activity_lottery_select.png" />
<Image Name="activity_renew.png" />
<Image Name="activity_tab_mask.png" />
<Project Name="ActivityGameLotteryItem.csd" Type="Layer" />
<Project Name="ActivityGameLotteryLayer.csd" Type="Layer" />
......
......@@ -28,5 +28,14 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/Activity/ActivityVip.csd" />
<FilePathData Path="ui/MainScene.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/Activity/ActivityVip.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......