0718

@@ -31,12 +31,13 @@
     <Item Key="TabsParamsKey">
     <Item Key="TabsParamsKey">
       <Value ctype="TabsInfo">
       <Value ctype="TabsInfo">
         <OpenedDocuments>
         <OpenedDocuments>
-          <FilePathData Path="ui/bird/LoadingScene.csd" />
-          <FilePathData Path="ui/bird/GameStartLayer.csd" />
-          <FilePathData Path="ui/bird/GameStartLayer_shdx.csd" />
-          <FilePathData Path="ui/bird/LoadingScene_shdx.csd" />
+          <FilePathData Path="ui/bird/GameOverLayer.csd" />
+          <FilePathData Path="ui/bird/GamePayConfirmLayer.csd" />
+          <FilePathData Path="ui/bird/GameFailLayer.csd" />
+          <FilePathData Path="ui/bird/ComboLayer.csd" />
+          <FilePathData Path="ui/bird/GameScene.csd" />
         </OpenedDocuments>
         </OpenedDocuments>
-        <ActiveDocument Path="ui/bird/LoadingScene_shdx.csd" />
+        <ActiveDocument Path="ui/bird/GameOverLayer.csd" />
       </Value>
       </Value>
     </Item>
     </Item>
   </Properties>
   </Properties>

@@ -9,6 +9,6 @@
     <isEffect>1</isEffect>
     <isEffect>1</isEffect>
     <fanpai_best>10</fanpai_best>
     <fanpai_best>10</fanpai_best>
     <candy_best>2391</candy_best>
     <candy_best>2391</candy_best>
-    <candy_game_play_cnt>31</candy_game_play_cnt>
+    <candy_game_play_cnt>33</candy_game_play_cnt>
     <is_game_vip>1</is_game_vip>
     <is_game_vip>1</is_game_vip>
 </userDefaultRoot>
 </userDefaultRoot>

 <?xml version="1.0"?>
 <?xml version="1.0"?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <propertyGroup>
   <propertyGroup>
-    <StartProgram>E:\xhx\client\runtime\win32\GuandanAndroid.exe</StartProgram>
-    <StartArguments>-workdir E:\xhx\client\candy\client</StartArguments>
-    <StartWorkingDirectory>E:\xhx\client\runtime\win32</StartWorkingDirectory>
+    <StartProgram>D:\xhx\client\runtime\win32\GuandanAndroid.exe</StartProgram>
+    <StartArguments>-workdir D:\xhx\client\candy\client</StartArguments>
+    <StartWorkingDirectory>D:\xhx\client\runtime\win32</StartWorkingDirectory>
   </propertyGroup>
   </propertyGroup>
 </Project>
 </Project>
\ No newline at end of file

@@ -35,8 +35,10 @@
           <FilePathData Path="ui/candy/GameStartLayer.csd" />
           <FilePathData Path="ui/candy/GameStartLayer.csd" />
           <FilePathData Path="ui/candy/GameStartLayer_shdx.csd" />
           <FilePathData Path="ui/candy/GameStartLayer_shdx.csd" />
           <FilePathData Path="ui/candy/LoadingScene_shdx.csd" />
           <FilePathData Path="ui/candy/LoadingScene_shdx.csd" />
+          <FilePathData Path="ui/candy/GameScene.csd" />
+          <FilePathData Path="ui/candy/Girl.csd" />
         </OpenedDocuments>
         </OpenedDocuments>
-        <ActiveDocument Path="ui/candy/LoadingScene_shdx.csd" />
+        <ActiveDocument Path="ui/candy/Girl.csd" />
       </Value>
       </Value>
     </Item>
     </Item>
   </Properties>
   </Properties>

@@ -3,7 +3,7 @@
     <!--m0800279afc6c-->
     <!--m0800279afc6c-->
     <!--m0800278b87c2-->
     <!--m0800278b87c2-->
     <!---->
     <!---->
-    <Account>xiaokanggogogo</Account>
+    <Account>m0800278b87c21</Account>
     <exp>0</exp>
     <exp>0</exp>
     <versionnum>201801291657</versionnum>
     <versionnum>201801291657</versionnum>
     <isMusic>0</isMusic>
     <isMusic>0</isMusic>
@@ -26,7 +26,7 @@
     <new_guide_step>4</new_guide_step>
     <new_guide_step>4</new_guide_step>
     <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
     <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
     <feiyanzoubi_best>603</feiyanzoubi_best>
     <feiyanzoubi_best>603</feiyanzoubi_best>
-    <uid>1060100010142861</uid>
+    <uid>1030100010142926</uid>
     <is_bird_game_guide>1</is_bird_game_guide>
     <is_bird_game_guide>1</is_bird_game_guide>
     <bird_best>1107</bird_best>
     <bird_best>1107</bird_best>
     <is_haidao_game_guide>1</is_haidao_game_guide>
     <is_haidao_game_guide>1</is_haidao_game_guide>

@@ -30,9 +30,9 @@
 	<common id="17" val="10"/>
 	<common id="17" val="10"/>
 	
 	
 	<!--每次PK赢取的金币数量-->
 	<!--每次PK赢取的金币数量-->
-	<common id="18" val="50"/>
+	<common id="18" val="100"/>
 	<!--每天PK赢取金币数量上限-->
 	<!--每天PK赢取金币数量上限-->
-	<common id="19" val="500"/>
+	<common id="19" val="1000"/>
 	
 	
 	<!--vip宠物战队数量-->
 	<!--vip宠物战队数量-->
 	<common id="20" val="6"/>
 	<common id="20" val="6"/>
@@ -48,5 +48,5 @@
 	<common id="24" val="15"/>
 	<common id="24" val="15"/>
 	
 	
 	<!--是否开启vip-->
 	<!--是否开启vip-->
-	<common id="10000" val="0"/>
+	<common id="10000" val="1"/>
 </root>
 </root>

@@ -10,7 +10,7 @@
 		4:每日首次充值(每个项目,每日只能购买一次)
 		4:每日首次充值(每个项目,每日只能购买一次)
         5:周期活动(每个周期只能购买一次)  startTime：活动开始时间  endTime:活动结束时间  cuccFlag:天津联通是否显示
         5:周期活动(每个周期只能购买一次)  startTime：活动开始时间  endTime:活动结束时间  cuccFlag:天津联通是否显示
 			product:商品,天津上线的金额商品，product命名规则不能更改，遵循之前的命名规则
 			product:商品,天津上线的金额商品，product命名规则不能更改，遵循之前的命名规则
-		6:购买游戏(包月31天).
+		6:已废弃.购买游戏(包月31天).
         payitem:购买月卡后一次性给的金币
         payitem:购买月卡后一次性给的金币
 	agentLv:代理购买等级  不填,默认为0
 	agentLv:代理购买等级  不填,默认为0
 	-->
 	-->
@@ -29,8 +29,8 @@
 		<pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="tjlhxkgddj008" productPuTao="qjqp008" agentLv="0"  notice="1"/>
 		<pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="tjlhxkgddj008" productPuTao="qjqp008" agentLv="0"  notice="1"/>
 		<pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="tjlhxkgddj009" productPuTao="qjqp009" agentLv="0"  notice="1"/>
 		<pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="tjlhxkgddj009" productPuTao="qjqp009" agentLv="0"  notice="1"/>
 		<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="tjlhxkgddj010" productPuTao="qjqp010" agentLv="0"  notice="1"/>
 		<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="tjlhxkgddj010" productPuTao="qjqp010" agentLv="0"  notice="1"/>
-		<pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600002,10" payitem=""  rmb="20.0" product="tjlhxkgddj201" productPuTao="qjqp201"  notice="1"/>
-		<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600004,10;200001,1" payitem=""  rmb="198.0" product="tjlhxkgddj202" productPuTao="qjqp202"  notice="1"/>
+		<pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600002,10" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="20.0" product="tjlhxkgddj201" productPuTao="qjqp201"  notice="1"/>
+		<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600004,10;200001,1" item_ext="200001,689;200002,200;200003,100;200004,10;200005,1" payitem=""  rmb="198.0" product="tjlhxkgddj202" productPuTao="qjqp202"  notice="1"/>
 	</platform>
 	</platform>
 	<!--天津-->
 	<!--天津-->
 	<platform id="103,102" channel="cucc">
 	<platform id="103,102" channel="cucc">
@@ -39,15 +39,18 @@
 		<pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="dclyac030" server="dclyac030" content="tjlhdcylyac030@" productPuTao="qjqp008" agentLv="0"  notice="1"/>
 		<pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="dclyac030" server="dclyac030" content="tjlhdcylyac030@" productPuTao="qjqp008" agentLv="0"  notice="1"/>
 		<pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="dclyac050" server="dclyac050" content="tjlhdcylyac050@" productPuTao="qjqp009" agentLv="0"  notice="1"/>
 		<pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="dclyac050" server="dclyac050" content="tjlhdcylyac050@" productPuTao="qjqp009" agentLv="0"  notice="1"/>
 		<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" server="dclyac100" content="tjlhdcylyac100@" productPuTao="qjqp010" agentLv="0"  notice="1"/>
 		<pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" server="dclyac100" content="tjlhdcylyac100@" 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="dclyby025" server="dclyby025" content="tjlhdcylyby025@" 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" server="dclybn198" content="tjlhdcylyac198@" 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" server="dclyby020" content="tjlhdcylyby020@" productPuTao="qjqp999"  notice="1"/>
+		<pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="25.0" product="dclyby025" server="dclyby025" content="tjlhdcylyby025@" productPuTao="qjqp201"  notice="1"/>
+		<pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" item_ext="200001,689;200002,200;200003,100;200004,10;200005,1" payitem=""  rmb="198.0" product="dclybn198" server="dclybn198" content="tjlhdcylyac198@" productPuTao="qjqp202"  notice="1"/>
+		<pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="20.0" product="dclyby020" server="dclyby020" content="tjlhdcylyby020@" productPuTao="qjqp999"  notice="1"/>
 	</platform>
 	</platform>
 	<!--上海电信-->
 	<!--上海电信-->
 	<platform id="106" channel="shdx">
 	<platform id="106" channel="shdx">
-		<pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" payitem=""  rmb="69.0" product="1000710508" productPuTao="qjqp201"  notice="1"/>
-		<pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" payitem=""  rmb="299.0" product="1000710226" productPuTao="qjqp202"  notice="1"/>
-		<pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" payitem=""  rmb="49.0" product="1000709506" productPuTao="qjqp999"  notice="1"/>
+		<pay id="201" name="月卡（31天）" type="2" des="4k动漫vip单月包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="69.0" product="1000710508" productPuTao="qjqp201"  notice="1"/>
+		<pay id="202" name="年卡（365天）" type="2" des="4k动漫vip年包" day="365" item="100001,2000;600002,5;200001,1" item_ext="200001,689;200002,200;200003,100;200004,10;200005,1" payitem=""  rmb="299.0" product="1000710226" productPuTao="qjqp202"  notice="1"/>
+		<pay id="301" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="49.0" product="1000709506" productPuTao="qjqp999"  notice="1"/>
+		<pay id="302" name="自动续包月卡（31天）" type="2" des="4K动漫vip包" day="31" item="100001,1000;600001,5" item_ext="300001,689;300002,200;300003,100;300004,10;300005,1" payitem=""  rmb="39.0" product="1000710713" productPuTao="qjqp999"  notice="1"/>
 	</platform>	
 	</platform>	
 
 
 </root>
 </root>
+
+

@@ -2294,9 +2294,10 @@
 		petstar中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的星级要比玩家随机一个宠物大2。
 		petstar中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的星级要比玩家随机一个宠物大2。
 		lv中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的等级要比玩家随机一个宠物大2。
 		lv中第一个数字表示需要进行差异化的宠物个数，第二个数字表示差异化的数值。示例中的“1,2”的意思为AI有1个宠的等级要比玩家随机一个宠物大2。
 		skill中的数字表示AI宠物的技能开启和玩家的差异。“1”代表需要比玩家多1个宠物开启了技能。
 		skill中的数字表示AI宠物的技能开启和玩家的差异。“1”代表需要比玩家多1个宠物开启了技能。
+		flag:1:使用指定的宠物组.0:按照参数随机(默认0)
 		-->
 		-->
 
 
-		<user id="1001" name="对手1001"  pk_val="500" petstar="0,0" lv="0,0" skill="0">
+		<user id="1001" name="对手1001"  pk_val="500" petstar="0,0" lv="0,0" skill="0" flag="1">
 			<!--
 			<!--
 				id//id
 				id//id
 				lv//等级
 				lv//等级
@@ -2311,62 +2312,11 @@
 			<pet id="10004" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
 			<pet id="10004" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
 			<pet id="10005" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
 			<pet id="10005" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
 			<pet id="10006" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
 			<pet id="10006" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
-			<pet id="10007" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
-			<pet id="10008" lv="1" skill_id="4000" ack="2" hp="4" congming="10"/>
-			<pet id="10009" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
-			<pet id="10010" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
-			<pet id="10011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
-			<pet id="10012" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
-			<pet id="10013" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
-			<pet id="10014" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
-			<pet id="10016" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
-			<pet id="10057" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
-			<pet id="10058" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
-			<pet id="20001" lv="1" skill_id="3006" ack="2" hp="4" congming="10"/>
-			<pet id="20002" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
-			<pet id="20003" lv="1" skill_id="4002" ack="2" hp="6" congming="10"/>
-			<pet id="20004" lv="1" skill_id="4007" ack="1" hp="6" congming="10"/>
-			<pet id="20005" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
-			<pet id="20006" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
-			<pet id="20007" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
-			<pet id="20008" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
-			<pet id="20009" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
-			<pet id="20010" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
-			<pet id="20011" lv="1" skill_id="1009" ack="1" hp="6" congming="10"/>
-			<pet id="20012" lv="1" skill_id="3007" ack="1" hp="1" congming="10"/>
-			<pet id="20013" lv="1" skill_id="3001" ack="2" hp="4" congming="10"/>
-			<pet id="20019" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
-			<pet id="20020" lv="1" skill_id="3003" ack="1" hp="6" congming="10"/>
-			<pet id="20022" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
-			<pet id="20023" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
-			<pet id="20026" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
-			<pet id="20029" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
-			<pet id="20035" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
-			<pet id="20046" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
-			<pet id="20048" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
-			<pet id="30003" lv="1" skill_id="1004" ack="2" hp="4" congming="10"/>
-			<pet id="30004" lv="1" skill_id="1016" ack="2" hp="5" congming="10"/>
-			<pet id="30005" lv="1" skill_id="1014" ack="2" hp="5" congming="10"/>
-			<pet id="30006" lv="1" skill_id="2007" ack="1" hp="6" congming="10"/>
-			<pet id="30007" lv="1" skill_id="4007" ack="1" hp="6" congming="10"/>
-			<pet id="30008" lv="1" skill_id="2003" ack="2" hp="4" congming="10"/>
-			<pet id="30009" lv="1" skill_id="2001" ack="3" hp="4" congming="10"/>
-			<pet id="30010" lv="1" skill_id="1008" ack="2" hp="5" congming="10"/>
-			<pet id="30011" lv="1" skill_id="4002" ack="2" hp="5" congming="10"/>
-			<pet id="30013" lv="1" skill_id="2000" ack="1" hp="7" congming="10"/>
-			<pet id="30014" lv="1" skill_id="1002" ack="2" hp="4" congming="10"/>
-			<pet id="30016" lv="1" skill_id="4006" ack="2" hp="5" congming="10"/>
-			<pet id="30018" lv="1" skill_id="1007" ack="1" hp="6" congming="10"/>
-			<pet id="30026" lv="1" skill_id="1010" ack="2" hp="5" congming="10"/>
-			<pet id="30027" lv="1" skill_id="3000" ack="2" hp="4" congming="10"/>
-			<pet id="30036" lv="1" skill_id="1004" ack="3" hp="4" congming="10"/>
-			<pet id="30037" lv="1" skill_id="2002" ack="2" hp="4" congming="10"/>
-			<pet id="30038" lv="1" skill_id="2002" ack="1" hp="6" congming="10"/>
-			<pet id="30040" lv="1" skill_id="4003" ack="3" hp="5" congming="10"/>
+
 
 
 		</user>
 		</user>
 		
 		
-		<user id="1002" name="对手1002"  pk_val="1000" petstar="0,0" lv="0,0" skill="1">
+		<user id="1002" name="对手1002"  pk_val="1000" petstar="0,0" lv="0,0" skill="0"  flag="0">
 			<!--
 			<!--
 				id//id
 				id//id
 				lv//等级
 				lv//等级
@@ -2468,7 +2418,7 @@
 
 
 		</user>
 		</user>
 		
 		
-		<user id="1003" name="对手1003"  pk_val="2000" petstar="0,0" lv="1,1" skill="1">
+		<user id="1003" name="对手1003"  pk_val="2000" petstar="0,0" lv="1,1" skill="1" flag="0">
 			<!--
 			<!--
 				id//id
 				id//id
 				lv//等级
 				lv//等级
@@ -2617,7 +2567,7 @@
 		
 		
 			</user>
 			</user>
 		
 		
-		<user id="1004" name="对手1004"  pk_val="9999999" petstar="1,1" lv="1,1" skill="1">
+		<user id="1004" name="对手1004"  pk_val="9999999" petstar="1,1" lv="1,1" skill="1" flag="0">
 			<!--
 			<!--
 				id//id
 				id//id
 				lv//等级
 				lv//等级

@@ -35,7 +35,7 @@
 		200006	宠物钥匙橙
 		200006	宠物钥匙橙
 	-->
 	-->
 
 
-	<game id="1" ename="cake" name="欢乐叠蛋糕" needVip="0" idx="3" payid="22" flag="free">
+	<game id="1" ename="cake" name="欢乐叠蛋糕" needVip="1" idx="3" payid="22" flag="">
 		<score val="0"    item="" key=""/>
 		<score val="0"    item="" key=""/>
 		<score val="5"    item="100002,2;100001,50;600001,2"   rate="30" key="200001,100"								/>
 		<score val="5"    item="100002,2;100001,50;600001,2"   rate="30" key="200001,100"								/>
 		<score val="10"   item="100002,4;100001,80;600001,3"   rate="40" key="200001,100"								/>
 		<score val="10"   item="100002,4;100001,80;600001,3"   rate="40" key="200001,100"								/>
@@ -47,7 +47,7 @@
 		<score val="150"  item="100002,10;100001,150;600002,1"  rate="70" key="200001,30;200002,30;200003,20;200004,20"	/>
 		<score val="150"  item="100002,10;100001,150;600002,1"  rate="70" key="200001,30;200002,30;200003,20;200004,20"	/>
 		<score val="200"  item="100002,10;100001,150;600002,2"  rate="80" key="200001,20;200002,30;200003,30;200004,20"   />
 		<score val="200"  item="100002,10;100001,150;600002,2"  rate="80" key="200001,20;200002,30;200003,30;200004,20"   />
 	</game>
 	</game>
-  <game id="2" ename="fanpai" name="记忆翻牌" needVip="0" idx="4" payid="21" flag="free">
+  <game id="2" ename="fanpai" name="记忆翻牌" needVip="1" idx="4" payid="21" flag="">
 		<score val="0"   item="" key=""/>
 		<score val="0"   item="" key=""/>
 		<score val="5"   item="100002,2;100001,10;600001,2"  rate="30" key="200001,100"						/>
 		<score val="5"   item="100002,2;100001,10;600001,2"  rate="30" key="200001,100"						/>
 		<score val="15"  item="100002,4;100001,50;600001,3"  rate="40" key="200001,100"						/>
 		<score val="15"  item="100002,4;100001,50;600001,3"  rate="40" key="200001,100"						/>

@@ -8,13 +8,13 @@
 	pr:概率(所有的概率加起来是1000)
 	pr:概率(所有的概率加起来是1000)
 	item:奖励的道具
 	item:奖励的道具
 	-->
 	-->
-	<reward id="1" pr="470" item="100001,30" des="金豆*30"/>
-	<reward id="2" pr="10" item="100001,50" des="金豆*50"/>
-	<reward id="3" pr="4" item="100001,100" des="金豆*100"/>
-	<reward id="4" pr="1" item="100001,200" des="金豆*200"/>
+	<reward id="1" pr="470" item="100001,100" des="金豆*100"/>
+	<reward id="2" pr="10" item="300001,1" des="宠物技能石白*1"/>
+	<reward id="3" pr="4" item="300002,1" des="宠物技能石绿*1"/>
+	<reward id="4" pr="1" item="300003,1" des="宠物技能石蓝*1"/>
 	<reward id="5" pr="0" item="100001,500" des="金豆*500"/>
 	<reward id="5" pr="0" item="100001,500" des="金豆*500"/>
-	<reward id="6" pr="500" item="600001,1" des="宠物饼干*1"/>
-	<reward id="7" pr="10" item="600002,1" des="宠物面包*1"/>
-	<reward id="8" pr="4" item="600003,1" des="宠物汉堡*1"/>
+	<reward id="6" pr="500" item="600001,5" des="宠物饼干*5"/>
+	<reward id="7" pr="10" item="600002,5" des="宠物面包*5"/>
+	<reward id="8" pr="4" item="600003,3" des="宠物汉堡*3"/>
     <reward id="9" pr="1" item="600004,1" des="宠物粮食*1"/>
     <reward id="9" pr="1" item="600004,1" des="宠物粮食*1"/>
 </root>
 </root>

-EnumEvent={};EnumEvent.SOCKET_DISCONNECT = "socket_disconnect";EnumEvent.SOCKET_RECONNECT = "socket_reconnect";
EnumEvent.LOGIN_SUCCESS = "login_success";EnumEvent.LOGIN_FAILD = "login_faild";
EnumEvent.UPDATE_ITEMS = "update_items";    --更新道具
EnumEvent.UPDATE_DIAMOND = "update_diamond";  --更新钻石
EnumEvent.UPDATE_COIN = "update_coin";  --更新金豆
EnumEvent.UPDATE_CHARM = "update_charm";  --更新魅力值
EnumEvent.UPDATE_DRESS = "update_dress";  --更新装扮
EnumEvent.UPDATE_TASK = "update_task";  --更新任务
EnumEvent.UPDATE_ACHIEVEMENT = "update_achievement";  --更新活动
EnumEvent.UPDATE_MAIL = "update_mail";  --更新邮件
EnumEvent.UPDATE_RANK_REWARD = "update_rank_reward";  --更新排行榜奖励
EnumEvent.UPDATE_ACTIVITY = "update_activity";  --更新活动
EnumEvent.UPDATE_WIN = "update_win";  --更新胜利次数
EnumEvent.UPDATE_LOST = "update_lost";  --更新失败次数
EnumEvent.UPDATE_SCORE = "update_score";  --更新分数
EnumEvent.UPDATE_VIP = "update_vip";  --更新VIP
EnumEvent.UPDATE_FIRST_PAY = "update_first_pay";  --更新首充礼包
EnumEvent.UPDATE_FIRST_CYCLE_PAY = "update_first_cycle_pay";  --更新周期首充礼包
EnumEvent.UPDATE_FREE_ITEM = "update_free_item";  --更新免费项信息
EnumEvent.USE_ITEM = "use_item";  --使用道具
EnumEvent.UPDATE_CLOTH = "update_cloth";  --装扮更新
EnumEvent.UPDATE_PET_DATA = "update_pet_data";    --更新宠物
EnumEvent.UPDATE_PET_POS = "update_pet_pos";    --更新宠物位置
EnumEvent.UPDATE_FRIEND_LIST = "update_friend_list";    --更新好友列表
EnumEvent.UPDATE_PET_TEAM = "update_pet_team";    --更新宠物战队

EnumEvent.NICK_CHANGE_SUCCESS = "nick_change_success";  --昵称修改成功
EnumEvent.HEAD_CHANGE_SUCCESS = "head_change_success";  --头像修改成功
EnumEvent.HEAD_FRAME_CHANGE_SUCCESS = "head_frame_change_success";  --头像框修改成功

EnumEvent.ACT_GET_GAME_CNT = "act_get_game_cnt";
EnumEvent.ACT_GET_LOTTERY = "act_get_lottery";
EnumEvent.ACT_MATCH_RANK_RES = "act_match_rank_res";

EnumEvent.CLOSE_ACTIVITY_VIP_VIEW = "close_activity_vip_view";
\ No newline at end of file
+EnumEvent={};EnumEvent.SOCKET_DISCONNECT = "socket_disconnect";EnumEvent.SOCKET_RECONNECT = "socket_reconnect";
EnumEvent.LOGIN_SUCCESS = "login_success";EnumEvent.LOGIN_FAILD = "login_faild";
EnumEvent.UPDATE_ITEMS = "update_items";    --更新道具
EnumEvent.UPDATE_DIAMOND = "update_diamond";  --更新钻石
EnumEvent.UPDATE_COIN = "update_coin";  --更新金豆
EnumEvent.UPDATE_CHARM = "update_charm";  --更新魅力值
EnumEvent.UPDATE_DRESS = "update_dress";  --更新装扮
EnumEvent.UPDATE_TASK = "update_task";  --更新任务
EnumEvent.UPDATE_ACHIEVEMENT = "update_achievement";  --更新活动
EnumEvent.UPDATE_MAIL = "update_mail";  --更新邮件
EnumEvent.UPDATE_RANK_REWARD = "update_rank_reward";  --更新排行榜奖励
EnumEvent.UPDATE_ACTIVITY = "update_activity";  --更新活动
EnumEvent.UPDATE_WIN = "update_win";  --更新胜利次数
EnumEvent.UPDATE_LOST = "update_lost";  --更新失败次数
EnumEvent.UPDATE_SCORE = "update_score";  --更新分数
EnumEvent.UPDATE_VIP = "update_vip";  --更新VIP
EnumEvent.UPDATE_FIRST_PAY = "update_first_pay";  --更新首充礼包
EnumEvent.UPDATE_FIRST_CYCLE_PAY = "update_first_cycle_pay";  --更新周期首充礼包
EnumEvent.UPDATE_FREE_ITEM = "update_free_item";  --更新免费项信息
EnumEvent.USE_ITEM = "use_item";  --使用道具
EnumEvent.UPDATE_CLOTH = "update_cloth";  --装扮更新
EnumEvent.UPDATE_PET_DATA = "update_pet_data";    --更新宠物
EnumEvent.UPDATE_PET_POS = "update_pet_pos";    --更新宠物位置
EnumEvent.UPDATE_FRIEND_LIST = "update_friend_list";    --更新好友列表
EnumEvent.UPDATE_PET_TEAM = "update_pet_team";    --更新宠物战队

EnumEvent.NICK_CHANGE_SUCCESS = "nick_change_success";  --昵称修改成功
EnumEvent.HEAD_CHANGE_SUCCESS = "head_change_success";  --头像修改成功
EnumEvent.HEAD_FRAME_CHANGE_SUCCESS = "head_frame_change_success";  --头像框修改成功

EnumEvent.ACT_GET_GAME_CNT = "act_get_game_cnt";
EnumEvent.ACT_GET_LOTTERY = "act_get_lottery";
EnumEvent.ACT_MATCH_RANK_RES = "act_match_rank_res";

EnumEvent.CLOSE_ACTIVITY_VIP_VIEW = "close_activity_vip_view";
EnumEvent.NO_PLAY = "no_play";  --今天不能再玩游戏了
\ No newline at end of file

@@ -8,17 +8,19 @@ local runningScene = nil;
 local lastPopTime = 0;
 local lastPopTime = 0;
 
 
 local function showPopItem()
 local function showPopItem()
+logUI("6666");
     if not isPopping then
     if not isPopping then
+    logUI("7777= "..#queuePopList);
         if #queuePopList > 0 then           
         if #queuePopList > 0 then           
             isPopping = true;
             isPopping = true;
-            
+            logUI("11111");
             local obj = queuePopList[1];
             local obj = queuePopList[1];
             table.remove(queuePopList,1);
             table.remove(queuePopList,1);
             
             
             local PopItem = cc.CSLoader:createNode("ui/PopItem.csb");
             local PopItem = cc.CSLoader:createNode("ui/PopItem.csb");
             local rect = PopItem:getBoundingBox();
             local rect = PopItem:getBoundingBox();
             PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
             PopItem:setPosition(cc.p(display.width/2-rect.width/2,display.height/2-rect.height/2));
-            
+            logUI("2222");
             local icon = PopItem:getChildByName("icon");
             local icon = PopItem:getChildByName("icon");
             icon:loadTexture("res/icon/"..obj.id..".png");
             icon:loadTexture("res/icon/"..obj.id..".png");
             local item_amount = PopItem:getChildByName("item_amount");
             local item_amount = PopItem:getChildByName("item_amount");
@@ -26,7 +28,7 @@ local function showPopItem()
             item_amount:setString(itemInfo.name.."* "..obj.num);
             item_amount:setString(itemInfo.name.."* "..obj.num);
         
         
             runningScene:addChild(PopItem,dialog.ZORDER_POP+1);
             runningScene:addChild(PopItem,dialog.ZORDER_POP+1);
-        
+        logUI("33333");
             local function fadeOutBack()
             local function fadeOutBack()
                 PopItem:removeSelf();
                 PopItem:removeSelf();
 
 
@@ -39,12 +41,14 @@ local function showPopItem()
             local moveBy = cc.MoveBy:create(1, cc.p(0, 200));
             local moveBy = cc.MoveBy:create(1, cc.p(0, 200));
             PopItem:runAction(moveBy);
             PopItem:runAction(moveBy);
             PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack)));
             PopItem:runAction(cc.Sequence:create(fadeOut,cc.CallFunc:create(fadeOutBack)));
-
+            logUI("4444");
             local function nextPopFun()
             local function nextPopFun()
             	isPopping = false;
             	isPopping = false;
+                logUI("0000");
                 showPopItem();
                 showPopItem();
             end
             end
-        
+        logUI("5555");
+        print("ItemManater showPopItem==================",runningScene);
             runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun)));
             runningScene:runAction(cc.Sequence:create(cc.DelayTime:create(0.3),cc.CallFunc:create(nextPopFun)));
         end
         end
     end
     end
@@ -61,6 +65,7 @@ function ItemManager.addPopItem(ID,num)
         runningScene = cc.Director:getInstance():getRunningScene();
         runningScene = cc.Director:getInstance():getRunningScene();
     end
     end
     queuePopList[#queuePopList+1] = obj;
     queuePopList[#queuePopList+1] = obj;
+    print("ItemManager runningScene================ ",runningScene);
 
 
 --    if ID == 100001 then
 --    if ID == 100001 then
 --        ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold"))
 --        ccs.ArmatureDataManager:getInstance():addArmatureFileInfo(string.format("res/effects/%s/%s.ExportJson","gold","gold"))

@@ -55,6 +55,7 @@ UserModel.new_chenghao_list = { };
 
 
 UserModel.team_id = 0;
 UserModel.team_id = 0;
 UserModel.pet_team = { };
 UserModel.pet_team = { };
+UserModel.single_game_cnt = { };    --每天玩游戏的免费次数
 
 
 local items = { };
 local items = { };
 local task_list = { };
 local task_list = { };
@@ -410,22 +411,25 @@ end
 -- 连接服务器成功（鉴权并向服务端发送鉴权结果）
 -- 连接服务器成功（鉴权并向服务端发送鉴权结果）
 function UserModel.onConnectSuccess(params)
 function UserModel.onConnectSuccess(params)
     logUI("on connect success");
     logUI("on connect success");
-    --APK容易崩溃，查找原因中。。。
-    --已解决，Android中加上了runOnUIThread导致的
+    -- APK容易崩溃，查找原因中。。。
+    -- 已解决，Android中加上了runOnUIThread导致的
     local targetPlatform = cc.Application:getInstance():getTargetPlatform();
     local targetPlatform = cc.Application:getInstance():getTargetPlatform();
-    if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then          --上海电信鉴权
+    if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
+        -- 上海电信鉴权
         local function callbackLua(params)
         local function callbackLua(params)
-            logUI("鉴权返回数据:"..params);
-            local arr = StringUtil.split(params,","); 
-            if arr[1] and arr[1] == "success" and arr[2] then    --支付成功
+            logUI("鉴权返回数据:" .. params);
+            local arr = StringUtil.split(params, ",");
+            if arr[1] and arr[1] == "success" and arr[2] then
+                -- 支付成功
                 logUI("on connect success callbackLua");
                 logUI("on connect success callbackLua");
-                MEMBER_TYPE = tonumber(arr[2]);      --初始化会员全局变量
+                MEMBER_TYPE = tonumber(arr[2]);
+                -- 初始化会员全局变量
                 SocketClient:getInstance():send("gateway_msg.login_msg",
                 SocketClient:getInstance():send("gateway_msg.login_msg",
                 {
                 {
                     platform = PLATFORM,
                     platform = PLATFORM,
                     account = account,
                     account = account,
                     session = session,
                     session = session,
-                    shanghai_dianxin_pay_id=tonumber(arr[2]),
+                    shanghai_dianxin_pay_id = tonumber(arr[2]),
                 } );
                 } );
                 logUI("从服务端返回会员类型：" .. arr[2]);
                 logUI("从服务端返回会员类型：" .. arr[2]);
             else
             else
@@ -435,12 +439,13 @@ function UserModel.onConnectSuccess(params)
                     platform = PLATFORM,
                     platform = PLATFORM,
                     account = account,
                     account = account,
                     session = session,
                     session = session,
-                    --shanghai_dianxin_pay_id=tonumber(arr[2]),
+                    -- shanghai_dianxin_pay_id=tonumber(arr[2]),
                 } );
                 } );
             end
             end
         end
         end
 
 
-        local luaj = require "cocos.cocos2d.luaj"; --引入luaj
+        local luaj = require "cocos.cocos2d.luaj";
+        -- 引入luaj
         local className = "org/cocos2dx/lua/AppActivity";
         local className = "org/cocos2dx/lua/AppActivity";
         local args = { callbackLua };
         local args = { callbackLua };
         local sigs = "(I)V";
         local sigs = "(I)V";
@@ -450,18 +455,21 @@ function UserModel.onConnectSuccess(params)
         -- luaj.callStaticMethod() 会返回两个值
         -- luaj.callStaticMethod() 会返回两个值
         -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
         -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
         -- 当失败时，第一个值为 false，第二个值是错误代码
         -- 当失败时，第一个值为 false，第二个值是错误代码
-        --local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
+        -- local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
         logUI("callStaticMethod----->authPermission");
         logUI("callStaticMethod----->authPermission");
         local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
         local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
         if not ok then
         if not ok then
             print("sendPayInfo error:" .. ret);
             print("sendPayInfo error:" .. ret);
         end
         end
-    elseif CHANNEL == "cucc" and targetPlatform == cc.PLATFORM_OS_ANDROID then      --天津联通鉴权
+    elseif CHANNEL == "cucc" and targetPlatform == cc.PLATFORM_OS_ANDROID then
+        -- 天津联通鉴权
         local function callbackLua(params)
         local function callbackLua(params)
-            logUI("天津鉴权返回数据: "..params);
-            if params=="success" then
-                MEMBER_TYPE = 1;      --初始化会员全局变量
-            else        --还不是会员，鉴权返回的productid保存再AppActivity中
+            logUI("天津鉴权返回数据: " .. params);
+            if params == "success" then
+                MEMBER_TYPE = 1;
+                -- 初始化会员全局变量
+            else
+                -- 还不是会员，鉴权返回的productid保存再AppActivity中
 
 
             end
             end
         end
         end
@@ -470,12 +478,12 @@ function UserModel.onConnectSuccess(params)
             platform = PLATFORM,
             platform = PLATFORM,
             account = account,
             account = account,
             session = session,
             session = session,
-                    --shanghai_dianxin_pay_id=tonumber(arr[2]),
+            -- shanghai_dianxin_pay_id=tonumber(arr[2]),
         } );
         } );
 
 
         local vipList = ShopInfo.getVipList();
         local vipList = ShopInfo.getVipList();
-        --续包月这里应该是server和content，但是配置表配反了
-        DeviceUtil.authPermissionForPruductId(vipList[3].server .. ",1,"..vipList[3].product, callbackLua);
+        -- 续包月这里应该是server和content，但是配置表配反了
+        DeviceUtil.authPermissionForPruductId(vipList[3].server .. ",1," .. vipList[3].product, callbackLua);
     else
     else
         SocketClient:getInstance():send("gateway_msg.login_msg",
         SocketClient:getInstance():send("gateway_msg.login_msg",
         {
         {
@@ -588,6 +596,11 @@ function UserModel.onLoginSuccessFun(params)
                 if vipList[3] and vipList[3].id == v.key then
                 if vipList[3] and vipList[3].id == v.key then
                     is_vip_lianxu = true;
                     is_vip_lianxu = true;
                 end
                 end
+                if CHANNEL == "shdx" then
+                    if vipList[4] and vipList[4].id == v.key then
+                        is_vip_lianxu = true;
+                    end
+                end
             end
             end
 
 
             --            UserModel.pay_day = {{key=201,val1=0,val2=0,val3=1543596600}};
             --            UserModel.pay_day = {{key=201,val1=0,val2=0,val3=1543596600}};
@@ -596,6 +609,14 @@ function UserModel.onLoginSuccessFun(params)
                 return aa.val3 < bb.val3;
                 return aa.val3 < bb.val3;
             end );
             end );
 
 
+            --小游戏免费使用过的次数  key:小游戏id,v1:次数
+
+            logD("free num===================>"..#params.data.single_game_cnt);
+            for i, v in ipairs(params.data.single_game_cnt) do
+                logD("free num-------------------->"..v.val1);
+                UserModel.single_game_cnt[i] = { key = v.key, val1 = v.val1, val2 = v.val2, val3 = v.val3 };
+            end
+
             UserModel.first_pay_id = TableUtil.copyTab(params.data.first_pay_id);
             UserModel.first_pay_id = TableUtil.copyTab(params.data.first_pay_id);
             UserModel.first_pay_daily_id = TableUtil.copyTab(params.data.pay_daily_id);
             UserModel.first_pay_daily_id = TableUtil.copyTab(params.data.pay_daily_id);
             UserModel.first_cycle_pay_id = TableUtil.copyTab(params.data.first_cycle_pay_id);
             UserModel.first_cycle_pay_id = TableUtil.copyTab(params.data.first_cycle_pay_id);
@@ -633,10 +654,10 @@ function UserModel.onLoginSuccessFun(params)
                 UserModel.furnitures[i] = { id = v.id, x = v.x, y = v.y };
                 UserModel.furnitures[i] = { id = v.id, x = v.x, y = v.y };
             end
             end
 
 
-            UserModel.free_game_id = { };
+            --[[UserModel.free_game_id = { };
             for i, v in ipairs(params.data.free_game_id) do
             for i, v in ipairs(params.data.free_game_id) do
                 UserModel.free_game_id[#UserModel.free_game_id + 1] = v;
                 UserModel.free_game_id[#UserModel.free_game_id + 1] = v;
-            end
+            end--]]
 
 
             UserModel.vip_pay_reward = { };
             UserModel.vip_pay_reward = { };
             for i, v in ipairs(params.data.vip_pay_reward) do
             for i, v in ipairs(params.data.vip_pay_reward) do
@@ -686,11 +707,18 @@ function UserModel.onLoginSuccessFun(params)
                             table.remove(UserModel.pay_day, i);
                             table.remove(UserModel.pay_day, i);
                             break;
                             break;
                         end
                         end
+                        if CHANNEL == "shdx" then
+                            if vipList[4] and vipList[4].id == v.key then
+                                table.remove(UserModel.pay_day, i);
+                                break;
+                            end
+                        end
                     end
                     end
                 end
                 end
             end
             end
 
 
-            if is_vip_lianxu and CHANNEL~="shdx" then           --上海电信已经鉴过权，所以这里不要再次鉴权了
+            if is_vip_lianxu and CHANNEL ~= "shdx" then
+                -- 上海电信已经鉴过权，所以这里不要再次鉴权了
                 DeviceUtil.authPermission(vipList[3].product .. ",2", authCallbackLua);
                 DeviceUtil.authPermission(vipList[3].product .. ",2", authCallbackLua);
             end
             end
 
 
@@ -937,6 +965,17 @@ function UserModel.getVipByID(id)
     return info;
     return info;
 end
 end
 
 
+function UserModel.getSingleGameById(id)
+    local info = { key = id, val1 = 0, val2 = 0, val3 = 0 };
+    for i, v in ipairs(UserModel.single_game_cnt) do
+        if v.key == id then
+            info = v;
+            break;
+        end
+    end
+    return info;
+end
+
 -- 获取最后一次VIP充值时间
 -- 获取最后一次VIP充值时间
 function UserModel.getLastVipPayTime()
 function UserModel.getLastVipPayTime()
     local info = { key = 0, val1 = 0, val2 = 0, val3 = 0 };
     local info = { key = 0, val1 = 0, val2 = 0, val3 = 0 };
@@ -1004,6 +1043,23 @@ function UserModel.getLeftVipDay()
         end
         end
     end
     end
 
 
+    --302
+    if CHANNEL=="shdx" then
+        local vipInfo4 = vipList[4];
+        if vipInfo4 then
+            local data4 = UserModel.getVipByID(vipInfo4.id);
+            local day4 = 0;
+            if data4 then
+                if data4.val1 > 0 or data4.val2 > 0 or data4.val3 > 0 then
+                    day4 = 9999;
+                end
+
+            left_day_num = math.max(left_day_num, day4);
+            -- 理论上这里是续包月，应该通过鉴权判断是否是VIP
+            end
+        end
+    end
+
     if CHANNEL == "gzdt" then
     if CHANNEL == "gzdt" then
         -- 大唐版本所有的用户都是VIP
         -- 大唐版本所有的用户都是VIP
         left_day_num = 100;
         left_day_num = 100;

@@ -157,15 +157,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+    GAME_ID=EnumGame.BIRD;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.BIRD);
         local game_info = SingleGameInfo.get_game_info(EnumGame.BIRD);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -111,14 +111,17 @@ function GameStartView:onStart()
         SoundManager.playEffect("res/ui/cake/star.ogg");
         SoundManager.playEffect("res/ui/cake/star.ogg");
         self:close();
         self:close();
     end
     end
-
+    GAME_ID=EnumGame.CAKE;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.CAKE);
         local game_info = SingleGameInfo.get_game_info(EnumGame.CAKE);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+        if UserModel.getLeftVipDay() == 0 then
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -110,15 +110,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+     GAME_ID=EnumGame.CANDY;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.CANDY);
         local game_info = SingleGameInfo.get_game_info(EnumGame.CANDY);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -63,6 +63,7 @@ function GameOverView:onAgain()
     end
     end
 
 
     if IS_XHX then
     if IS_XHX then
+        
         paySuccessFun();
         paySuccessFun();
     elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
     elseif CHANNEL == "shdx" and game_data.get_game_play_cnt() > 0 then
         local reciever = require("app.views.fanpai.GamePayView"):show("",paySuccessFun);
         local reciever = require("app.views.fanpai.GamePayView"):show("",paySuccessFun);

@@ -146,15 +146,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+    GAME_ID=EnumGame.FANPAI;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.FANPAI);
         local game_info = SingleGameInfo.get_game_info(EnumGame.FANPAI);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -116,15 +116,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+    GAME_ID=EnumGame.FEIYANZOUBI;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.FEIYANZOUBI);
         local game_info = SingleGameInfo.get_game_info(EnumGame.FEIYANZOUBI);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -104,15 +104,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+     GAME_ID=EnumGame.GUESS;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS);
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -104,15 +104,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+     GAME_ID=EnumGame.GUESS_COLOR;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS_COLOR);
         local game_info = SingleGameInfo.get_game_info(EnumGame.GUESS_COLOR);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -156,15 +156,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+    GAME_ID=EnumGame.HAIDAO;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.HAIDAO);
         local game_info = SingleGameInfo.get_game_info(EnumGame.HAIDAO);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -157,15 +157,18 @@ function GameStartView:onStart()
         end
         end
         self:close();
         self:close();
     end
     end
-
+     GAME_ID=EnumGame.RABBIT;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.RABBIT);
         local game_info = SingleGameInfo.get_game_info(EnumGame.RABBIT);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -198,6 +198,11 @@ function MainScene:onCreate(params)
     cmsg.on("gateway_msg.sys_notice_msg_res", self.noticeCallbackFun);
     cmsg.on("gateway_msg.sys_notice_msg_res", self.noticeCallbackFun);
     self.onSignResFun = handler(self, self.onSignRes);
     self.onSignResFun = handler(self, self.onSignRes);
     cmsg.on("gateway_msg.sign_msg_res", self.onSignResFun);
     cmsg.on("gateway_msg.sign_msg_res", self.onSignResFun);
+
+    --读取上海电信的优惠订购活动表
+    if CHANNEL=="shdx" then
+        self:readCdnConfig();
+    end 
 end
 end
 
 
 MainScene.notice_list = { };
 MainScene.notice_list = { };
@@ -770,4 +775,62 @@ function MainScene:updateSelectedState(near_node, isBounce, is_show_highlight)
     MainScene.super.updateSelectedState(self, near_node, isBounce, is_show_highlight);
     MainScene.super.updateSelectedState(self, near_node, isBounce, is_show_highlight);
 end
 end
 
 
+
+--读取cdn活动配置表
+function MainScene:readCdnConfig()
+    local CDN_ACTIVITY_SHDX_URL = ConfigInfo.getConfigInfo("cdn_activity_shdx_url") or "";        --电信活动时间
+    if CDN_ACTIVITY_SHDX_URL and CDN_ACTIVITY_SHDX_URL ~= "" then
+        HttpRequest:get(CDN_ACTIVITY_SHDX_URL,nil, handler(self,self.urlConnectionCDNSuccess),handler(self,self.urlConnectionCDNFaild),0)
+    end
+end
+
+function MainScene:urlConnectionCDNSuccess(params)
+    --logUI("HttpURLConnection配置表返回："..params);
+    local start_time = "";
+    local end_time = "";
+    local function readLineFun(lineStr)
+        local contents = StringUtil.split(lineStr,';');
+        --logUI("读取contents= "..contents[1]);
+        if contents[1] == "activity_start_time" then
+            start_time = contents[2];
+        elseif contents[1] == "activity_end_time" then
+            end_time = contents[2];
+        end
+    end
+
+    local index = 1;
+    local function readLine(str)
+        local a,b = string.find(str,"\r\n");
+
+        if a then
+            local lineStr = string.sub(str,1,a-1);
+            if index > 1 then
+                readLineFun(lineStr);
+            end
+            index = index + 1;
+            str = string.sub(str,b+1);
+            readLine(str);
+        else
+            readLineFun(str);
+        end
+    end
+    readLine(params);
+
+    local date=os.date("%Y-%m-%d %H:%M:%S");    --当前时间
+    if self:get_timestamp(date)-self:get_timestamp(start_time)>0 and self:get_timestamp(date)-self:get_timestamp(end_time)<0 then
+        logUI("上海电信活动开始了");
+        ACTIVITY_SHDX=1;
+    end
+end
+
+function MainScene:urlConnectionCDNFaild()
+    print("读取CDN服务器配置失败！");
+end
+
+function MainScene:get_timestamp(str_date)
+    local pattern = "(%d+)-(%d+)-(%d+) (%d+):(%d+):(%d+)";
+    local year, month, day, hour, minute, seconds = str_date:match(pattern);
+    return os.time({year = year, month = month, day = day, hour = hour, min = minute, sec = seconds});
+end
+
 return MainScene
 return MainScene
\ No newline at end of file

@@ -130,14 +130,18 @@ function GameStartView:onStart()
         self:close();
         self:close();
     end
     end
 
 
+    GAME_ID=EnumGame.SHUYISHU;
     if IS_XHX then
     if IS_XHX then
         local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU);
         local game_info = SingleGameInfo.get_game_info(EnumGame.SHUYISHU);
         print("打开小游戏：",game_info.id);
         print("打开小游戏：",game_info.id);
-        if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
+        if UserModel.getLeftVipDay() == 0 then
             print("小游戏购买界面");
             print("小游戏购买界面");
-            local my_diamond_num = UserModel.getDiamond();
-            if my_diamond_num >= game_info.diamond then
-                Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
             else
             else
                 if CHANNEL=="shdx" then
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);

@@ -330,6 +330,7 @@ function ActivityView:updateTabState()
 end
 end
 
 
 function ActivityView:update_nodes(_nodes)
 function ActivityView:update_nodes(_nodes)
+    --logUI("领取后回调 "..#_nodes);
     self.nodes = TableUtil.merge(self.nodes_copy,_nodes);
     self.nodes = TableUtil.merge(self.nodes_copy,_nodes);
 
 
     if #_nodes > 0 then
     if #_nodes > 0 then

@@ -185,7 +185,7 @@ function ActivityVipView:update(_is_init)
     -- 包年
     -- 包年
     local vipInfo2 = vipList[2];
     local vipInfo2 = vipList[2];
     local itemList2 = vipInfo2.itemList;
     local itemList2 = vipInfo2.itemList;
-    for i = 1, 3 do
+    for i = 1, 2 do
         local item = self:getChildByName("y_item_" .. i);
         local item = self:getChildByName("y_item_" .. i);
         if i <= #itemList2 then
         if i <= #itemList2 then
             item:setVisible(true);
             item:setVisible(true);

@@ -41,6 +41,16 @@ function ActivityVipView:init()
         end
         end
         self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
         self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
     end
     end
+    if vipList[4] then
+        self.btn_vip_lianxu.id = vipList[4].id;
+        self.btn_vip_lianxu.fn = function()
+            self:onGetContinueClick(self.btn_vip_lianxu);
+        end
+        self.btn_vip_lianxu:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetContinueClick)) end);
+    end
+    if ACTIVITY_SHDX==1 then
+        self.btn_vip_lianxu:getChildByName("txt"):setString("39元包月");
+    end
 
 
     self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
     self.btn_lingqu_month = self:getChildByName("btn_lingqu_month");
     self.btn_lingqu_month.id = vipList[1].id;
     self.btn_lingqu_month.id = vipList[1].id;
@@ -113,6 +123,9 @@ function ActivityVipView:update(_is_init)
     -- 连续包月
     -- 连续包月
     local vipInfo3 = vipList[3];
     local vipInfo3 = vipList[3];
     local data3 = UserModel.getVipByID(vipInfo3.id);         --包年礼包详情
     local data3 = UserModel.getVipByID(vipInfo3.id);         --包年礼包详情
+    -- 活动连续包月302
+    local vipInfo4 = vipList[4];
+    local data4 = UserModel.getVipByID(vipInfo4.id);         --包年礼包详情
 
 
 
 
     local itemList1 = vipInfo1.itemList;            
     local itemList1 = vipInfo1.itemList;            
@@ -141,6 +154,11 @@ function ActivityVipView:update(_is_init)
         if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
         if data3 and(data3.val1 > 0 or data3.val2 > 0 or data3.val3 > 0) then
             has_vip_month = true;
             has_vip_month = true;
         end
         end
+    elseif vipInfo4 then
+        local data4 = UserModel.getVipByID(vipInfo4.id);
+        if data4 and(data4.val1 > 0 or data4.val2 > 0 or data4.val3 > 0) then
+            has_vip_month = true;
+        end
     end
     end
 
 
     local data1 = UserModel.getVipByID(vipInfo1.id);
     local data1 = UserModel.getVipByID(vipInfo1.id);
@@ -193,10 +211,34 @@ function ActivityVipView:update(_is_init)
         end
         end
     end
     end
 
 
+    if vipInfo4 then                                        --续包月礼包详情
+        local data4 = UserModel.getVipByID(vipInfo4.id);
+        if MEMBER_TYPE==302 and data4 and(data4.val1 > 0 or data4.val2 > 0 or data4.val3 > 0) then
+            logUI("302--");
+            if data4.val1 == 0 or not TimeUtil.isToday(UserModel.time_second, data4.val1) then
+                -- 可领取
+                self.btn_lingqu_month:setVisible(true);
+                self.btn_lingqu_month.id = vipInfo4.id;
+                _nodes[1] = { self.btn_lingqu_month };
+            else
+                -- 已领取
+                self.btn_lingqu_month:setVisible(false);
+                self.yilingqu_month:setVisible(true);
+            end
+        elseif MEMBER_TYPE==0 then            --显示续包月按钮
+            self.btn_vip_lianxu:setVisible(true);
+            if #_nodes > 0 then
+                _nodes[1][#_nodes[1]+1] = self.btn_vip_lianxu;
+            else
+                _nodes[1] = {self.btn_vip_lianxu};
+            end
+        end
+    end
+
     -- 包年
     -- 包年
     
     
     local itemList2 = vipInfo2.itemList;
     local itemList2 = vipInfo2.itemList;
-    for i = 1, 3 do
+    for i = 1, 2 do
         local item = self:getChildByName("y_item_" .. i);
         local item = self:getChildByName("y_item_" .. i);
         if i <= #itemList2 then
         if i <= #itemList2 then
             item:setVisible(true);
             item:setVisible(true);
@@ -300,6 +342,11 @@ function ActivityVipView:onLingquClick(ref)
         local shopInfo = ShopInfo.getPayInfo(ref.id);
         local shopInfo = ShopInfo.getPayInfo(ref.id);
         ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
         ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
     end
     end
+
+    --[[local _nodes = { };
+    _nodes[1] = { self.btn_close };
+    self.nodeIndex = 1;
+    self:updateSelectedState();--]]
 end
 end
 
 
 return ActivityVipView
 return ActivityVipView
\ No newline at end of file

@@ -86,8 +86,8 @@ function FriendView:init()
 
 
 
 
         --一个位置免费、一个位置付费
         --一个位置免费、一个位置付费
-        local free_game_score_list = {};
-        local game_score_list = {};
+        --[[local free_game_score_list = {};        --免费游戏分数
+        local game_score_list = {};           --会员游戏分数
         for i,v in ipairs(game_score) do
         for i,v in ipairs(game_score) do
             if SingleGameInfo.get_game_info(v.key).needVip == 0 then
             if SingleGameInfo.get_game_info(v.key).needVip == 0 then
                 free_game_score_list[#free_game_score_list+1] = v;
                 free_game_score_list[#free_game_score_list+1] = v;
@@ -106,24 +106,26 @@ function FriendView:init()
             game_list[2] = {key=math.random(7,8),val1=0};
             game_list[2] = {key=math.random(7,8),val1=0};
         else
         else
             game_list[2] = game_score_list[1];
             game_list[2] = game_score_list[1];
+        end--]]
+
+        local game_list = {};
+        --先随机两个游戏
+        game_list[1] = {key=math.random(1,10),val1=0};
+        game_list[2] = {key=math.random(1,10),val1=0};
+        if game_list[1].key==game_list[2].key and game_list[2].key~=10 then             --随机出来的两个游戏可能相同
+            game_list[2].key=game_list[2].key+1;
+        elseif game_list[1].key==game_list[2].key and game_list[2].key==10 then
+            game_list[2].key=game_list[2].key11;
+        end
+        --随机游戏有没有玩过带分数的
+        for i,v in ipairs(game_score) do
+            if v.key == game_list[1].key then
+                game_list[1].val1 = v.val1;
+            elseif v.key == game_list[2].key then
+                game_list[2].val1 = v.val1;
+            end
         end 
         end 
         
         
-        --按好友游戏分数高低显示，如果好友没玩过游戏，就显示小马宝利和旋转海盗
---        if #game_score == 0 then
---            game_list[1] = {key=7,val1=0};
---            game_list[2] = {key=8,val1=0};
---        elseif #game_score == 1 then
---            game_list[1] = game_score[1];
---            if game_list[1].key == 7 then
---                game_list[2] = {key=8,val1=0};
---            else
---                game_list[2] = {key=7,val1=0};
---            end
---        elseif #game_score >= 2 then
---            for i=1,2 do
---                game_list[#game_list+1] = game_score[i];
---            end
---        end
 
 
         for i=1,2 do
         for i=1,2 do
             local btn = self.panel:getChildByName("btn_pk_"..i);
             local btn = self.panel:getChildByName("btn_pk_"..i);
@@ -143,7 +145,7 @@ function FriendView:init()
             if cc.FileUtils:getInstance():isFileExist(icon_url) then
             if cc.FileUtils:getInstance():isFileExist(icon_url) then
                 btn:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
                 btn:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
             else
             else
-                btn:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/ui/friend/pk_game_0.png"):getSpriteFrame());
+                btn:getChildByName("icon"):setSpriteFrame(cc.Sprite:create("res/ui/friend/pk_game_0.png"):getSpriteFrame());--默认图片
             end
             end
         end
         end
         self.btn_record:setVisible(false);
         self.btn_record:setVisible(false);
@@ -511,11 +513,19 @@ function FriendView:onPkClick(ref)
     end
     end
 
 
     local function okPayFun()
     local function okPayFun()
+        GAME_ID=gameid;
         if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
         if game_info.needVip == 1 and UserModel.getLeftVipDay() == 0 and not TableUtil.IsInTable(UserModel.free_game_id,game_info.id) then
             local my_diamond_num = UserModel.getDiamond();
             local my_diamond_num = UserModel.getDiamond();
             --if my_diamond_num >= game_info.diamond then
             --if my_diamond_num >= game_info.diamond then
             --    Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             --    Alert.showTwo("玩这游戏需要扣除"..game_info.diamond.."个钻石，是否继续？",paySuccessFun);
             --else
             --else
+            local free_every_day_num=UserModel.getSingleGameById(game_info.id); --今天的免费次数是否用完
+            if free_every_day_num.val1==0 then
+                logUI("每天免费玩一次");
+                local info = { key = game_info.id, val1 = 1, val2 = 1, val3 = 1 };
+                UserModel.single_game_cnt[#UserModel.single_game_cnt + 1] = info;
+                paySuccessFun();
+            else
                 local reciever = nil;
                 local reciever = nil;
                 if CHANNEL=="cucc" then
                 if CHANNEL=="cucc" then
                     reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
                     reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
@@ -523,7 +533,7 @@ function FriendView:onPkClick(ref)
                     reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                 end
                 end
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-            --end
+            end
             return;
             return;
         else
         else
             paySuccessFun();
             paySuccessFun();

@@ -450,10 +450,31 @@ function LoginView:doLogin(account)
             verifystring = md5(verifystring);
             verifystring = md5(verifystring);
             logUI("登录验证："..verifystring);
             logUI("登录验证："..verifystring);
 
 
-            if CHANNEL=="gzdt" then 
-                 UserModel.login("guangdong-cmcc.login.xhx.topdraw.cn","10400","xiaokanggogogo","");    --直接调用gateway,跳过登录接口  __TODO:jinwawa 大唐
-                 --UserModel.login("http://10.100.6.130","50101","xiaokanggogogo","");    --直接调用gateway,跳过登录接口  __TODO:jinwawa
+            if CHANNEL=="gzdt" then                             --广州移动版本可能需要灵活替换ip
+                local function callbackLua(params)
+                    logUI("替换ip返回数据:"..params);
+                    if params~="" then
+                        local arr = StringUtil.split(params,","); 
+                        if arr[1] and arr[2] then    
+                            UserModel.login(arr[1],arr[2],"xiaokanggogogo","");    --直接调用gateway,跳过登录接口  __TODO:jinwawa 大唐
                         else 
                         else 
+                            UserModel.login("183.234.214.1","10400","xiaokanggogogo","");    --直接调用gateway,跳过登录接口  __TODO:jinwawa 大唐     
+                        end
+                    else
+                        UserModel.login("183.234.214.1","10400","xiaokanggogogo","");    --直接调用gateway,跳过登录接口  __TODO:jinwawa 大唐              
+                    end                                      
+                end
+        
+                local luaj = require "cocos.cocos2d.luaj"; --引入luaj
+                local className = "org/cocos2dx/lua/AppActivity";
+                local args = { callbackLua };
+                local sigs = "(I)V";
+                logUI("callStaticMethod----->sendReplaceIpInfo");
+                local ok, ret = luaj.callStaticMethod(className, "sendReplaceIpInfo", args, sigs);
+                if not ok then
+                    print("sendPayInfo error:" .. ret);
+                end
+            else        --其他渠道不变仍然需要登录ip
                 HttpRequest:getInstance():post(GAME_LOGIN_URL,{platform=PLATFORM,account=self.account,verify=verifystring,openid=self.openid,access_token=self.access_token},handler(self,self.onLoginServerBackFun),handler(self,self.onLoginServerFaildFun));
                 HttpRequest:getInstance():post(GAME_LOGIN_URL,{platform=PLATFORM,account=self.account,verify=verifystring,openid=self.openid,access_token=self.access_token},handler(self,self.onLoginServerBackFun),handler(self,self.onLoginServerFaildFun));
             end                      
             end                      
         end
         end

-local PetTeamListView = dialog.uinode("ui/pet/PetTeamListLayer.csb",import(".BaseViewNew"))
+local PetTeamListView = dialog.uinode("ui/pet/PetTeamListLayer.csb", import(".BaseViewNew"))
 
 
---宠物战队列表
+-- 宠物战队列表
 function PetTeamListView:ctor()
 function PetTeamListView:ctor()
     PetTeamListView.super.ctor(self);
     PetTeamListView.super.ctor(self);
     self:init();
     self:init();
@@ -9,35 +9,35 @@ end
 function PetTeamListView:show()
 function PetTeamListView:show()
     local scene = cc.Director:getInstance():getRunningScene()
     local scene = cc.Director:getInstance():getRunningScene()
     local inst = PetTeamListView:create();
     local inst = PetTeamListView:create();
-    scene:addChild(inst,dialog.ZORDER_APP);
+    scene:addChild(inst, dialog.ZORDER_APP);
 
 
     local panel = inst:getChildByName("panel");
     local panel = inst:getChildByName("panel");
     panel:setScale(0.5);
     panel:setScale(0.5);
-    local scaleTo = cc.ScaleTo:create(0.2,1);
+    local scaleTo = cc.ScaleTo:create(0.2, 1);
     panel:runAction(scaleTo);
     panel:runAction(scaleTo);
 
 
     return inst;
     return inst;
 end
 end
 
 
 function PetTeamListView:init()
 function PetTeamListView:init()
-    self:setContentSize(cc.size(display.width,display.height));
+    self:setContentSize(cc.size(display.width, display.height));
     ccui.Helper:doLayout(self);
     ccui.Helper:doLayout(self);
 
 
     self.scrollView = self:getChildByName("panel"):getChildByName("ScrollView");
     self.scrollView = self:getChildByName("panel"):getChildByName("ScrollView");
 
 
     self.btn_close = self:getChildByName("panel"):getChildByName("btn_close");
     self.btn_close = self:getChildByName("panel"):getChildByName("btn_close");
-    self.btn_close.fn = handler(self,self.onClose);
-    self.btn_close:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type,self.btn_close.fn)end);
+    self.btn_close.fn = handler(self, self.onClose);
+    self.btn_close:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, self.btn_close.fn) end);
 
 
     self:update();
     self:update();
 
 
     if #self.nodes[2] > 0 then
     if #self.nodes[2] > 0 then
-        self:updateSelectedState(self.nodes[2][1],false);
+        self:updateSelectedState(self.nodes[2][1], false);
     else
     else
-        self:updateSelectedState(self.nodes[1][1],false);
+        self:updateSelectedState(self.nodes[1][1], false);
     end
     end
 
 
-    EventListener.addEventListener(self,EnumEvent.UPDATE_PET_TEAM,handler(self,self.onPetTeamUpdate));
+    EventListener.addEventListener(self, EnumEvent.UPDATE_PET_TEAM, handler(self, self.onPetTeamUpdate));
 end
 end
 
 
 function PetTeamListView:onPetTeamUpdate(eve)
 function PetTeamListView:onPetTeamUpdate(eve)
@@ -45,19 +45,19 @@ function PetTeamListView:onPetTeamUpdate(eve)
 end
 end
 
 
 function PetTeamListView:update()
 function PetTeamListView:update()
-    self.nodes = {};
-    self.nodes[1] = {self.btn_close};
-    self.nodes[2] = {};
+    self.nodes = { };
+    self.nodes[1] = { self.btn_close };
+    self.nodes[2] = { };
 
 
     self.list = UserModel.pet_team;
     self.list = UserModel.pet_team;
 
 
     self._list_cnt = 6;
     self._list_cnt = 6;
-    local _y = self._list_cnt*160;
+    local _y = self._list_cnt * 160;
     if _y < 500 then
     if _y < 500 then
         _y = 500;
         _y = 500;
     end
     end
-    for i=1,self._list_cnt do
-        local item = self.scrollView:getChildByName("item_"..i);
+    for i = 1, self._list_cnt do
+        local item = self.scrollView:getChildByName("item_" .. i);
         local btn_1;
         local btn_1;
         local btn_2;
         local btn_2;
         local btn_vip;
         local btn_vip;
@@ -65,44 +65,44 @@ function PetTeamListView:update()
             item = cc.CSLoader:createNode("ui/pet/PetTeamListItemLayer.csb");
             item = cc.CSLoader:createNode("ui/pet/PetTeamListItemLayer.csb");
             item.i = i;
             item.i = i;
             item.is_item = true;
             item.is_item = true;
-            item:setName("item_"..i);
+            item:setName("item_" .. i);
             self.scrollView:addChild(item);
             self.scrollView:addChild(item);
 
 
             btn_1 = item:getChildByName("btn_1");
             btn_1 = item:getChildByName("btn_1");
             btn_2 = item:getChildByName("btn_2");
             btn_2 = item:getChildByName("btn_2");
             btn_vip = item:getChildByName("btn_vip");
             btn_vip = item:getChildByName("btn_vip");
 
 
-            btn_1.fn = function ()
+            btn_1.fn = function()
                 self:onChangeClick(btn_1);
                 self:onChangeClick(btn_1);
             end;
             end;
-            btn_1:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type,btn_1.fn)end);
-            btn_2.fn = function ()
+            btn_1:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_1.fn) end);
+            btn_2.fn = function()
                 self:onFightClick(btn_2);
                 self:onFightClick(btn_2);
             end;
             end;
-            btn_2:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type,btn_2.fn)end);
-            btn_vip.fn = function ()
+            btn_2:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_2.fn) end);
+            btn_vip.fn = function()
                 self:onVipClick(btn_vip);
                 self:onVipClick(btn_vip);
             end;
             end;
-            btn_vip:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type,btn_vip.fn)end);
+            btn_vip:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, btn_vip.fn) end);
         else
         else
             btn_1 = item:getChildByName("btn_1");
             btn_1 = item:getChildByName("btn_1");
             btn_2 = item:getChildByName("btn_2");
             btn_2 = item:getChildByName("btn_2");
             btn_vip = item:getChildByName("btn_vip");
             btn_vip = item:getChildByName("btn_vip");
         end
         end
-        item:setPosition(cc.p(15,_y - i*160-10));
-        if CHANNEL=="shdx" then
+        item:setPosition(cc.p(15, _y - i * 160 - 10));
+        if CHANNEL == "shdx" then
             btn_vip:getChildByName("txt"):setString("开通会员");
             btn_vip:getChildByName("txt"):setString("开通会员");
             btn_vip:getChildByName("selected"):getChildByName("txt"):setString("开通会员");
             btn_vip:getChildByName("selected"):getChildByName("txt"):setString("开通会员");
         end
         end
 
 
         local data = self.list[i];
         local data = self.list[i];
         if data then
         if data then
-            for ii=1,4 do
-                local item_pet = item:getChildByName("item_"..ii);
+            for ii = 1, 4 do
+                local item_pet = item:getChildByName("item_" .. ii);
                 local pet_id = data.pet_id[ii];
                 local pet_id = data.pet_id[ii];
                 if pet_id then
                 if pet_id then
                     local pet_info = PetInfo.get_pet_info(pet_id);
                     local pet_info = PetInfo.get_pet_info(pet_id);
-                    local icon_url = "res/pet/head/"..pet_id..".png";
+                    local icon_url = "res/pet/head/" .. pet_id .. ".png";
                     if cc.FileUtils:getInstance():isFileExist(icon_url) then
                     if cc.FileUtils:getInstance():isFileExist(icon_url) then
                         item_pet:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
                         item_pet:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
                     else
                     else
@@ -113,74 +113,80 @@ function PetTeamListView:update()
                 item_pet:getChildByName("pet_no"):setVisible(false);
                 item_pet:getChildByName("pet_no"):setVisible(false);
             end
             end
         else
         else
-            for ii=1,4 do
-                local item_pet = item:getChildByName("item_"..ii);
+            for ii = 1, 4 do
+                local item_pet = item:getChildByName("item_" .. ii);
                 item_pet:getChildByName("x"):setVisible(false);
                 item_pet:getChildByName("x"):setVisible(false);
                 item_pet:getChildByName("pet_no"):setVisible(false);
                 item_pet:getChildByName("pet_no"):setVisible(false);
             end
             end
         end
         end
 
 
-        item:getChildByName("txt"):setString("队伍"..i);
+        item:getChildByName("txt"):setString("队伍" .. i);
 
 
         if UserModel.getLeftVipDay() > 0 or i <= 2 then
         if UserModel.getLeftVipDay() > 0 or i <= 2 then
             btn_1:setVisible(true);
             btn_1:setVisible(true);
             btn_vip:setVisible(false);
             btn_vip:setVisible(false);
-            self.nodes[2][#self.nodes[2]+1] = btn_1;
+            self.nodes[2][#self.nodes[2] + 1] = btn_1;
             if i == UserModel.team_id then
             if i == UserModel.team_id then
                 item:getChildByName("txt_chuzhan"):setVisible(true);
                 item:getChildByName("txt_chuzhan"):setVisible(true);
                 btn_2:setVisible(false);
                 btn_2:setVisible(false);
             else
             else
                 item:getChildByName("txt_chuzhan"):setVisible(false);
                 item:getChildByName("txt_chuzhan"):setVisible(false);
                 btn_2:setVisible(true);
                 btn_2:setVisible(true);
-                self.nodes[2][#self.nodes[2]+1] = btn_2;
+                self.nodes[2][#self.nodes[2] + 1] = btn_2;
             end
             end
         else
         else
             item:getChildByName("txt_chuzhan"):setVisible(false);
             item:getChildByName("txt_chuzhan"):setVisible(false);
             btn_vip:setVisible(true);
             btn_vip:setVisible(true);
             btn_1:setVisible(false);
             btn_1:setVisible(false);
             btn_2:setVisible(false);
             btn_2:setVisible(false);
-            self.nodes[2][#self.nodes[2]+1] = btn_vip;
+            self.nodes[2][#self.nodes[2] + 1] = btn_vip;
         end
         end
     end
     end
-    self.scrollView:setInnerContainerSize(cc.size(1030,_y+10));
+    self.scrollView:setInnerContainerSize(cc.size(1030, _y + 10));
 end
 end
 
 
-function PetTeamListView:onChangeClick(ref,event)
+function PetTeamListView:onChangeClick(ref, event)
     local reciever = require("app.views.view.PetTeamEditView"):show(ref:getParent().i);
     local reciever = require("app.views.view.PetTeamEditView"):show(ref:getParent().i);
     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
 end
 end
 
 
-function PetTeamListView:onFightClick(ref,event)
+function PetTeamListView:onFightClick(ref, event)
     UserModel.team_id = ref:getParent().i;
     UserModel.team_id = ref:getParent().i;
-    SocketClient:getInstance():send("gateway_msg.set_btl_team_id_msg",{team_id=UserModel.team_id});
+    SocketClient:getInstance():send("gateway_msg.set_btl_team_id_msg", { team_id = UserModel.team_id });
     EventListener.dispatchEvent(EnumEvent.UPDATE_PET_TEAM);
     EventListener.dispatchEvent(EnumEvent.UPDATE_PET_TEAM);
 end
 end
 
 
-function PetTeamListView:onVipClick(ref,event)
+function PetTeamListView:onVipClick(ref, event)
     self.vip_btn_1 = ref:getParent():getChildByName("btn_1");
     self.vip_btn_1 = ref:getParent():getChildByName("btn_1");
+    if CHANNEL ~= "shdx" then
         local reciever = require("app.views.view.ActivityView"):show("ActivityVipView");
         local reciever = require("app.views.view.ActivityView"):show("ActivityVipView");
         cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
         cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
-    --local vipList = ShopInfo.getVipList();
-    --local shopInfo = ShopInfo.getPayInfo(vipList[1].id);
-    --ShopModel.pay(shopInfo.product,shopInfo.name,shopInfo.costList[1].num,handler(self,self.onPayCallBack));
+    else
+        local reciever = require("app.views.view.XyxPayView_shdx"):show();
+        cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+    end
+
+    -- local vipList = ShopInfo.getVipList();
+    -- local shopInfo = ShopInfo.getPayInfo(vipList[1].id);
+    -- ShopModel.pay(shopInfo.product,shopInfo.name,shopInfo.costList[1].num,handler(self,self.onPayCallBack));
 
 
---    UserModel.addVip(shopInfo.id);
---    self:onPayCallBack("success");
+    --    UserModel.addVip(shopInfo.id);
+    --    self:onPayCallBack("success");
 end
 end
 
 
 function PetTeamListView:onPayCallBack(params)
 function PetTeamListView:onPayCallBack(params)
     if params == "success" then
     if params == "success" then
-        if not TableUtil.IsInTable(UserModel.free_game_id,self.game_id) then
-            table.insert(UserModel.free_game_id,self.game_id);
+        if not TableUtil.IsInTable(UserModel.free_game_id, self.game_id) then
+            table.insert(UserModel.free_game_id, self.game_id);
         end
         end
 
 
         LoadingManager.showDataLoading();
         LoadingManager.showDataLoading();
 
 
-        self:runAction(cc.Sequence:create(cc.DelayTime:create(1),cc.CallFunc:create(function ()
+        self:runAction(cc.Sequence:create(cc.DelayTime:create(1), cc.CallFunc:create( function()
             LoadingManager.removeDataLoading();
             LoadingManager.removeDataLoading();
             self:update();
             self:update();
             self:updateSelectedState(self.vip_btn_1);
             self:updateSelectedState(self.vip_btn_1);
-        end)));
+        end )));
     end
     end
 end
 end
 
 
@@ -188,12 +194,12 @@ function PetTeamListView:onClose()
     self:close();
     self:close();
 end
 end
 
 
---返回键处理函数
+-- 返回键处理函数
 function PetTeamListView:onKeypadBack()
 function PetTeamListView:onKeypadBack()
     self:close();
     self:close();
 end
 end
 
 
---确认键处理函数
+-- 确认键处理函数
 function PetTeamListView:onKeypadOk()
 function PetTeamListView:onKeypadOk()
     if self.selected_node and self.selected_node.fn then
     if self.selected_node and self.selected_node.fn then
         self.selected_node:fn();
         self.selected_node:fn();
@@ -201,7 +207,7 @@ function PetTeamListView:onKeypadOk()
 end
 end
 
 
 function PetTeamListView:onKeypadUp()
 function PetTeamListView:onKeypadUp()
-    PetTeamListView.super.onKeypadUp(self,false);
+    PetTeamListView.super.onKeypadUp(self, false);
 
 
     if self.selected_node and self.selected_node:getParent().is_item then
     if self.selected_node and self.selected_node:getParent().is_item then
         self:setScrollPosition(self.selected_node:getParent());
         self:setScrollPosition(self.selected_node:getParent());
@@ -209,38 +215,38 @@ function PetTeamListView:onKeypadUp()
 end
 end
 
 
 function PetTeamListView:onKeypadDown()
 function PetTeamListView:onKeypadDown()
-    PetTeamListView.super.onKeypadDown(self,false);
+    PetTeamListView.super.onKeypadDown(self, false);
 
 
     if self.selected_node and self.selected_node:getParent().is_item then
     if self.selected_node and self.selected_node:getParent().is_item then
         self:setScrollPosition(self.selected_node:getParent());
         self:setScrollPosition(self.selected_node:getParent());
     end
     end
 end
 end
 
 
---左键处理函数
+-- 左键处理函数
 function PetTeamListView:onKeypadLeft()
 function PetTeamListView:onKeypadLeft()
-    PetTeamListView.super.onKeypadLeft(self,false);
+    PetTeamListView.super.onKeypadLeft(self, false);
 end
 end
 
 
---右键处理函数
+-- 右键处理函数
 function PetTeamListView:onKeypadRight()
 function PetTeamListView:onKeypadRight()
-    PetTeamListView.super.onKeypadRight(self,false);
+    PetTeamListView.super.onKeypadRight(self, false);
 end
 end
 
 
 function PetTeamListView:setScrollPosition(node)
 function PetTeamListView:setScrollPosition(node)
     local scrollSize = self.scrollView:getContentSize();
     local scrollSize = self.scrollView:getContentSize();
 
 
-    local len = self._list_cnt*160+10;
-    local currentY = len - (node:getPositionY()+160+5);
-    if currentY > len-scrollSize.height then
-        currentY = len-scrollSize.height;
+    local len = self._list_cnt * 160 + 10;
+    local currentY = len -(node:getPositionY() + 160 + 5);
+    if currentY > len - scrollSize.height then
+        currentY = len - scrollSize.height;
     elseif currentY < 0 then
     elseif currentY < 0 then
         currentY = 0;
         currentY = 0;
     end
     end
     local per = 0;
     local per = 0;
-    if len-scrollSize.height > 0 then
-        per = currentY*100/(len-scrollSize.height);
+    if len - scrollSize.height > 0 then
+        per = currentY * 100 /(len - scrollSize.height);
     end
     end
-    self.scrollView:scrollToPercentVertical(per,0.5,true);
+    self.scrollView:scrollToPercentVertical(per, 0.5, true);
 end
 end
 
 
 return PetTeamListView
 return PetTeamListView
\ No newline at end of file

@@ -333,8 +333,13 @@ function ShopView:onBuyClick(ref,event)
 
 
     if itemInfo.vip == 1 and UserModel.getLeftVipDay() == 0 then
     if itemInfo.vip == 1 and UserModel.getLeftVipDay() == 0 then
         local function okFun()
         local function okFun()
+            if CHANNEL~="shdx" then
                 local reciever=require("app.views.view.ActivityView"):show("ActivityVipView");
                 local reciever=require("app.views.view.ActivityView"):show("ActivityVipView");
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            else
+                local reciever = require("app.views.view.XyxPayView_shdx"):show();
+                cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+            end
         end
         end
         if CHANNEL=="shdx" then
         if CHANNEL=="shdx" then
             Alert.showTwo(strings.msg_1035,okFun);
             Alert.showTwo(strings.msg_1035,okFun);

@@ -139,8 +139,13 @@ function XyxGameOver:onAgain()
         self:close();
         self:close();
     end
     end
 
 
+    local free_every_day_num=UserModel.getSingleGameById(GAME_ID).val1; --今天的免费次数是否用完
     if IS_XHX then
     if IS_XHX then
+        if free_every_day_num==1 then
+            Alert.showOne("您的免费试玩已结束");
+        else
             paySuccessFun();
             paySuccessFun();
+        end       
     else
     else
         paySuccessFun();
         paySuccessFun();
     end
     end

@@ -23,7 +23,6 @@ function XyxPayView:show(game_id, onPaySuccessFun)
     -- registerScriptTouchEvent(inst.layer,handler(inst,inst.onTouchBegin),handler(inst,inst.onTouchMove),handler(inst,inst.onTouchEnd));
     -- registerScriptTouchEvent(inst.layer,handler(inst,inst.onTouchBegin),handler(inst,inst.onTouchMove),handler(inst,inst.onTouchEnd));
 
 
     inst:init();
     inst:init();
-
     return inst;
     return inst;
 end
 end
 
 
@@ -69,6 +68,12 @@ function XyxPayView:init()
 
 
     self:updateSelectedState(self.btn_buy);
     self:updateSelectedState(self.btn_buy);
 
 
+    --logUI("上海电信活动= "..ACTIVITY_SHDX);
+    if ACTIVITY_SHDX==1 then
+        self.btn_buy:loadTextureNormal("res/ui/xyx/shanghai_ctcc/bg_left_activity.png");
+        self.btn_buy:getChildByName("selected"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/bg_left_selected_activity.png"):getSpriteFrame());
+    end
+
     EventListener.addEventListener(self, EnumEvent.UPDATE_DIAMOND, handler(self, self.onDiamondUpdate));
     EventListener.addEventListener(self, EnumEvent.UPDATE_DIAMOND, handler(self, self.onDiamondUpdate));
 end
 end
 
 
@@ -124,8 +129,12 @@ end
 --续包月
 --续包月
 function XyxPayView:onBuyClick(ref, event)
 function XyxPayView:onBuyClick(ref, event)
     local vipList = ShopInfo.getVipList();
     local vipList = ShopInfo.getVipList();
+    if ACTIVITY_SHDX==1 then
+        MEMBER_TYPE=vipList[4].id;
+    else
         MEMBER_TYPE=vipList[3].id;
         MEMBER_TYPE=vipList[3].id;
-    local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
+    end
+    local shopInfo = ShopInfo.getPayInfo(MEMBER_TYPE);
     -- 包月卡的id，获取包月卡的item信息
     -- 包月卡的id，获取包月卡的item信息
     -- 天津联通支付，支持连续包月
     -- 天津联通支付，支持连续包月
     --logUI("ActivityVipView:onGetContinueClick------------------>");
     --logUI("ActivityVipView:onGetContinueClick------------------>");
@@ -214,7 +223,11 @@ function XyxPayView:updateSelectedState(near_node, isBounce, is_show_highlight)
     end--]]
     end--]]
 
 
     if near_node:getName()=="btn_buy" then      --续包月
     if near_node:getName()=="btn_buy" then      --续包月
+         if ACTIVITY_SHDX==1 then
+            self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt_activity.png"):getSpriteFrame());
+         else
             self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt2.png"):getSpriteFrame());
             self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt2.png"):getSpriteFrame());
+         end        
     elseif near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then  --包月
     elseif near_node:getName() == "btn_vip_month" or near_node:getName() == "btn_vip_year" then  --包月
          self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt.png"):getSpriteFrame());
          self.panel:getChildByName("pic_txt"):setSpriteFrame(cc.Sprite:create("res/ui/xyx/shanghai_ctcc/txt.png"):getSpriteFrame());
     end
     end

@@ -16,6 +16,7 @@ PROXY_SOCK_ADDR = nil;
 IS_TV = 1;
 IS_TV = 1;
 
 
 IS_XHX = true;
 IS_XHX = true;
+CURRENT_GAME_ID=0;
 
 
 PAY_URL = "http://101.132.118.17";
 PAY_URL = "http://101.132.118.17";
 SHARE_URL = "https://fir.im/qjqp2018";
 SHARE_URL = "https://fir.im/qjqp2018";

@@ -39,7 +39,7 @@ local proto_id_map_send =
     ["gateway_msg.notify_pay_succ_msg"] = 0x00351,   --购买成功
     ["gateway_msg.notify_pay_succ_msg"] = 0x00351,   --购买成功
     ["gateway_msg.get_pay_day_reward_msg"] = 0x00352,   --领取购买的每天领取奖励
     ["gateway_msg.get_pay_day_reward_msg"] = 0x00352,   --领取购买的每天领取奖励
     ["gateway_msg.shanghai_dianxin_pay_msg"] = 0x00353,   --
     ["gateway_msg.shanghai_dianxin_pay_msg"] = 0x00353,   --
-    ["gateway_msg.single_game_info_msg"] = 0x00354,   --获取游戏信息
+    --["gateway_msg.single_game_info_msg"] = 0x00354,   --获取游戏信息
     ["gateway_msg.single_game_rank_msg"] = 0x00355,   --获取游戏排行
     ["gateway_msg.single_game_rank_msg"] = 0x00355,   --获取游戏排行
     ["gateway_msg.single_game_end_msg"] = 0x00356,   --游戏结束
     ["gateway_msg.single_game_end_msg"] = 0x00356,   --游戏结束
     ["gateway_msg.get_vip_pay_reward_msg"] = 0x00358,   --领取vip 按时间充值活动(每个时间段充值,只能领取一次) 的奖励
     ["gateway_msg.get_vip_pay_reward_msg"] = 0x00358,   --领取vip 按时间充值活动(每个时间段充值,只能领取一次) 的奖励

@@ -27,8 +27,10 @@ local function main()
     PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
     PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
     PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
     PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
     IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
     IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
-    MEMBER_TYPE = 0;
     -- 会员类型，0:不是会员, 其他对应pay.xml中的pay_id
     -- 会员类型，0:不是会员, 其他对应pay.xml中的pay_id
+    MEMBER_TYPE = 0;
+    --上海电信的优惠订购活动
+    ACTIVITY_SHDX=0;
 
 
     require "core.log.init";
     require "core.log.init";
     require "core.net.socket_connection";
     require "core.net.socket_connection";

@@ -17,7 +17,7 @@
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.1983" Y="0.6643" />
                 <PrePosition X="0.1983" Y="0.6643" />
                 <PreSize X="0.3240" Y="0.5728" />
                 <PreSize X="0.3240" Y="0.5728" />
-                <FileData Type="Normal" Path="ui/Activity/activity_flag_limit.png" Plist="" />
+                <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
             </Children>
             </Children>
@@ -41,7 +41,7 @@
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.1421" Y="1.4461" />
                 <PrePosition X="0.1421" Y="1.4461" />
                 <PreSize X="0.2929" Y="0.5566" />
                 <PreSize X="0.2929" Y="0.5566" />
-                <FileData Type="Normal" Path="ui/Activity/activity_flag_limit.png" Plist="" />
+                <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
             </Children>
             </Children>

@@ -58,7 +58,7 @@
                         <Position X="0.9998" Y="-0.0008" />
                         <Position X="0.9998" Y="-0.0008" />
                         <Scale ScaleX="1.0000" ScaleY="1.0000" />
                         <Scale ScaleX="1.0000" ScaleY="1.0000" />
                         <CColor A="255" R="255" G="255" B="255" />
                         <CColor A="255" R="255" G="255" B="255" />
-                        <PrePosition X="0.0031" Y="0.0000" />
+                        <PrePosition X="0.0031" />
                         <PreSize X="1.0000" Y="1.0000" />
                         <PreSize X="1.0000" Y="1.0000" />
                         <SingleColor A="255" R="150" G="200" B="255" />
                         <SingleColor A="255" R="150" G="200" B="255" />
                         <FirstColor A="255" R="150" G="200" B="255" />
                         <FirstColor A="255" R="150" G="200" B="255" />
@@ -111,7 +111,7 @@
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.6234" Y="0.5488" />
                 <PrePosition X="0.6234" Y="0.5488" />
                 <PreSize X="0.3918" Y="0.4606" />
                 <PreSize X="0.3918" Y="0.4606" />
-                <FileData Type="Normal" Path="ui/Activity/img_no_activity.png" Plist="" />
+                <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
               <AbstractNodeData Name="btn_close" ActionTag="-661351794" Tag="1384" IconVisible="False" LeftMargin="-53.1557" RightMargin="1047.1558" TopMargin="-18.9395" BottomMargin="613.9395" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="48" Scale9Height="56" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
               <AbstractNodeData Name="btn_close" ActionTag="-661351794" Tag="1384" IconVisible="False" LeftMargin="-53.1557" RightMargin="1047.1558" TopMargin="-18.9395" BottomMargin="613.9395" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="48" Scale9Height="56" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">

@@ -6,7 +6,7 @@
       <ObjectData Name="Layer" Tag="297" ctype="GameLayerObjectData">
       <ObjectData Name="Layer" Tag="297" ctype="GameLayerObjectData">
         <Size X="810.0000" Y="550.0000" />
         <Size X="810.0000" Y="550.0000" />
         <Children>
         <Children>
-          <AbstractNodeData Name="bg" ActionTag="-43469328" Tag="2051" IconVisible="False" LeftMargin="-199.2473" RightMargin="-109.7527" TopMargin="-39.6893" BottomMargin="-67.3106" LeftEage="369" RightEage="369" TopEage="216" BottomEage="216" Scale9OriginX="369" Scale9OriginY="216" Scale9Width="381" Scale9Height="225" ctype="ImageViewObjectData">
+          <AbstractNodeData Name="bg" ActionTag="-43469328" Tag="2051" IconVisible="False" LeftMargin="-199.2473" RightMargin="-109.7527" TopMargin="-39.6894" BottomMargin="-67.3106" LeftEage="369" RightEage="369" TopEage="216" BottomEage="216" Scale9OriginX="369" Scale9OriginY="216" Scale9Width="381" Scale9Height="225" ctype="ImageViewObjectData">
             <Size X="1119.0000" Y="657.0000" />
             <Size X="1119.0000" Y="657.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <Position X="360.2527" Y="261.1894" />
             <Position X="360.2527" Y="261.1894" />
@@ -47,16 +47,50 @@
             <FileData Type="Normal" Path="ui/Activity/bg_welfare.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/bg_welfare.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
           </AbstractNodeData>
-          <AbstractNodeData Name="Image_56" ActionTag="-523748571" Tag="981" IconVisible="False" LeftMargin="-77.0328" RightMargin="410.0328" TopMargin="95.2604" BottomMargin="-67.2604" LeftEage="157" RightEage="157" TopEage="172" BottomEage="172" Scale9OriginX="157" Scale9OriginY="172" Scale9Width="163" Scale9Height="178" ctype="ImageViewObjectData">
+          <AbstractNodeData Name="Image_56" ActionTag="-523748571" Tag="981" IconVisible="False" LeftMargin="-78.5988" RightMargin="411.5988" TopMargin="95.3107" BottomMargin="-67.3107" LeftEage="157" RightEage="157" TopEage="172" BottomEage="172" Scale9OriginX="157" Scale9OriginY="172" Scale9Width="163" Scale9Height="178" ctype="ImageViewObjectData">
             <Size X="477.0000" Y="522.0000" />
             <Size X="477.0000" Y="522.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-            <Position X="161.4672" Y="193.7396" />
+            <Position X="159.9012" Y="193.6893" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <CColor A="255" R="255" G="255" B="255" />
             <CColor A="255" R="255" G="255" B="255" />
-            <PrePosition X="0.1993" Y="0.3523" />
+            <PrePosition X="0.1974" Y="0.3522" />
             <PreSize X="0.5889" Y="0.9491" />
             <PreSize X="0.5889" Y="0.9491" />
             <FileData Type="Normal" Path="ui/Activity/bg_gift_one_month.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/bg_gift_one_month.png" Plist="" />
           </AbstractNodeData>
           </AbstractNodeData>
+          <AbstractNodeData Name="Image_3" ActionTag="-271120697" Tag="215" IconVisible="False" LeftMargin="103.4728" RightMargin="599.5272" TopMargin="319.3336" BottomMargin="136.6665" LeftEage="35" RightEage="35" TopEage="31" BottomEage="31" Scale9OriginX="35" Scale9OriginY="31" Scale9Width="37" Scale9Height="32" ctype="ImageViewObjectData">
+            <Size X="107.0000" Y="94.0000" />
+            <Children>
+              <AbstractNodeData Name="Image_4" ActionTag="2093597283" Tag="216" IconVisible="False" LeftMargin="4.8119" RightMargin="2.1881" TopMargin="-9.2453" BottomMargin="3.2453" LeftEage="33" RightEage="33" TopEage="33" BottomEage="33" Scale9OriginX="33" Scale9OriginY="33" Scale9Width="34" Scale9Height="34" ctype="ImageViewObjectData">
+                <Size X="100.0000" Y="100.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="54.8119" Y="53.2453" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.5123" Y="0.5664" />
+                <PreSize X="0.9346" Y="1.0638" />
+                <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg_1.png" Plist="" />
+              </AbstractNodeData>
+              <AbstractNodeData Name="Text_1" ActionTag="1345923896" Tag="217" IconVisible="False" LeftMargin="-26.6874" RightMargin="-29.3126" TopMargin="51.2452" BottomMargin="16.7548" FontSize="20" LabelText="随机宠物技能石X1" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="163.0000" Y="26.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="54.8126" Y="29.7548" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.5123" Y="0.3165" />
+                <PreSize X="1.5234" Y="0.2766" />
+                <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
+                <OutlineColor A="255" R="30" G="144" B="255" />
+                <ShadowColor A="255" R="110" G="110" B="110" />
+              </AbstractNodeData>
+            </Children>
+            <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+            <Position X="156.9728" Y="183.6665" />
+            <Scale ScaleX="1.0000" ScaleY="1.0000" />
+            <CColor A="255" R="255" G="255" B="255" />
+            <PrePosition X="0.1938" Y="0.3339" />
+            <PreSize X="0.1321" Y="0.1709" />
+            <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg.png" Plist="" />
+          </AbstractNodeData>
           <AbstractNodeData Name="Image_57" ActionTag="-734408069" Tag="982" IconVisible="False" LeftMargin="408.0482" RightMargin="-16.0482" TopMargin="92.5436" BottomMargin="-64.5436" LeftEage="137" RightEage="137" TopEage="172" BottomEage="172" Scale9OriginX="137" Scale9OriginY="172" Scale9Width="144" Scale9Height="178" ctype="ImageViewObjectData">
           <AbstractNodeData Name="Image_57" ActionTag="-734408069" Tag="982" IconVisible="False" LeftMargin="408.0482" RightMargin="-16.0482" TopMargin="92.5436" BottomMargin="-64.5436" LeftEage="137" RightEage="137" TopEage="172" BottomEage="172" Scale9OriginX="137" Scale9OriginY="172" Scale9Width="144" Scale9Height="178" ctype="ImageViewObjectData">
             <Size X="418.0000" Y="522.0000" />
             <Size X="418.0000" Y="522.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
@@ -67,7 +101,7 @@
             <PreSize X="0.5160" Y="0.9491" />
             <PreSize X="0.5160" Y="0.9491" />
             <FileData Type="Normal" Path="ui/Activity/bg_gift_one_year.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/bg_gift_one_year.png" Plist="" />
           </AbstractNodeData>
           </AbstractNodeData>
-          <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="78.9926" RightMargin="569.0074" TopMargin="492.2479" BottomMargin="-2.2479" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
+          <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="78.9750" RightMargin="569.0250" TopMargin="492.2479" BottomMargin="-2.2479" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
             <Size X="162.0000" Y="60.0000" />
             <Size X="162.0000" Y="60.0000" />
             <Children>
             <Children>
               <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
               <AbstractNodeData Name="selected" ActionTag="-330155765" Tag="70" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
@@ -95,7 +129,7 @@
               </AbstractNodeData>
               </AbstractNodeData>
             </Children>
             </Children>
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-            <Position X="159.9926" Y="27.7521" />
+            <Position X="159.9750" Y="27.7521" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <CColor A="255" R="255" G="255" B="255" />
             <CColor A="255" R="255" G="255" B="255" />
             <PrePosition X="0.1975" Y="0.0505" />
             <PrePosition X="0.1975" Y="0.0505" />
@@ -107,7 +141,7 @@
             <OutlineColor A="255" R="255" G="0" B="0" />
             <OutlineColor A="255" R="255" G="0" B="0" />
             <ShadowColor A="255" R="110" G="110" B="110" />
             <ShadowColor A="255" R="110" G="110" B="110" />
           </AbstractNodeData>
           </AbstractNodeData>
-          <AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="78.2819" RightMargin="569.7181" TopMargin="493.3691" BottomMargin="-3.3692" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
+          <AbstractNodeData Name="btn_lingqu_month" Visible="False" ActionTag="-1209852045" Tag="241" IconVisible="False" LeftMargin="78.2819" RightMargin="569.7181" TopMargin="493.3692" BottomMargin="-3.3692" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
             <Size X="162.0000" Y="60.0000" />
             <Size X="162.0000" Y="60.0000" />
             <Children>
             <Children>
               <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
               <AbstractNodeData Name="selected" ActionTag="1930414194" Tag="203" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
@@ -168,7 +202,7 @@
             <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/achievement_yilingqu.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
           </AbstractNodeData>
-          <AbstractNodeData Name="btn_vip_year" ActionTag="1349290642" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="560.6194" RightMargin="87.3806" TopMargin="492.5581" BottomMargin="-2.5581" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
+          <AbstractNodeData Name="btn_vip_year" ActionTag="1349290642" Tag="485" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="560.6010" RightMargin="87.3990" TopMargin="492.5581" BottomMargin="-2.5581" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
             <Size X="162.0000" Y="60.0000" />
             <Size X="162.0000" Y="60.0000" />
             <Children>
             <Children>
               <AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
               <AbstractNodeData Name="selected" ActionTag="806992118" Tag="223" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" ctype="SpriteObjectData">
@@ -207,7 +241,7 @@
               </AbstractNodeData>
               </AbstractNodeData>
             </Children>
             </Children>
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-            <Position X="641.6194" Y="27.4419" />
+            <Position X="641.6010" Y="27.4419" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <Scale ScaleX="1.0000" ScaleY="1.0000" />
             <CColor A="255" R="255" G="255" B="255" />
             <CColor A="255" R="255" G="255" B="255" />
             <PrePosition X="0.7921" Y="0.0499" />
             <PrePosition X="0.7921" Y="0.0499" />
@@ -435,25 +469,25 @@
           <AbstractNodeData Name="y_item_3" ActionTag="42590575" Tag="233" IconVisible="False" LeftMargin="558.5416" RightMargin="151.4584" TopMargin="271.8746" BottomMargin="178.1254" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
           <AbstractNodeData Name="y_item_3" ActionTag="42590575" Tag="233" IconVisible="False" LeftMargin="558.5416" RightMargin="151.4584" TopMargin="271.8746" BottomMargin="178.1254" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
             <Size X="100.0000" Y="100.0000" />
             <Size X="100.0000" Y="100.0000" />
             <Children>
             <Children>
-              <AbstractNodeData Name="icon" ActionTag="1181012539" Tag="240" IconVisible="False" LeftMargin="9.9999" RightMargin="10.0001" TopMargin="7.2831" BottomMargin="12.7169" ctype="SpriteObjectData">
-                <Size X="80.0000" Y="80.0000" />
+              <AbstractNodeData Name="icon" ActionTag="1181012539" Tag="240" IconVisible="False" LeftMargin="3.1534" RightMargin="-11.1534" TopMargin="-6.0118" BottomMargin="1.0118" ctype="SpriteObjectData">
+                <Size X="108.0000" Y="105.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-                <Position X="49.9999" Y="52.7169" />
-                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <Position X="57.1534" Y="53.5118" />
+                <Scale ScaleX="0.6000" ScaleY="0.6000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
-                <PrePosition X="0.5000" Y="0.5272" />
-                <PreSize X="0.8000" Y="0.8000" />
-                <FileData Type="Normal" Path="icon/600001.png" Plist="" />
+                <PrePosition X="0.5715" Y="0.5351" />
+                <PreSize X="1.0800" Y="1.0500" />
+                <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg_2.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
-              <AbstractNodeData Name="txt" ActionTag="-201570632" Tag="235" IconVisible="False" LeftMargin="24.8318" RightMargin="15.1682" TopMargin="54.6606" BottomMargin="15.3394" FontSize="24" LabelText="2000" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                <Size X="60.0000" Y="30.0000" />
+              <AbstractNodeData Name="txt" ActionTag="-201570632" Tag="235" IconVisible="False" LeftMargin="-30.6682" RightMargin="-40.3318" TopMargin="54.6606" BottomMargin="15.3394" FontSize="24" LabelText="随机宠物钥匙X1" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="171.0000" Y="30.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="54.8318" Y="30.3394" />
                 <Position X="54.8318" Y="30.3394" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5483" Y="0.3034" />
                 <PrePosition X="0.5483" Y="0.3034" />
-                <PreSize X="0.6000" Y="0.3000" />
+                <PreSize X="1.7100" Y="0.3000" />
                 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
                 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
                 <OutlineColor A="255" R="30" G="144" B="255" />
                 <OutlineColor A="255" R="30" G="144" B="255" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
                 <ShadowColor A="255" R="110" G="110" B="110" />

@@ -41,7 +41,7 @@
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5052" Y="0.4913" />
                 <PrePosition X="0.5052" Y="0.4913" />
                 <PreSize X="0.7476" Y="0.5813" />
                 <PreSize X="0.7476" Y="0.5813" />
-                <FileData Type="Normal" Path="ui/Activity/img_activity_vip_daily.png" Plist="" />
+                <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
               <AbstractNodeData Name="bg_activity_vip_daily_title_64" ActionTag="-1872609804" Tag="448" IconVisible="False" LeftMargin="71.4066" RightMargin="78.5934" TopMargin="2.5289" BottomMargin="457.4711" ctype="SpriteObjectData">
               <AbstractNodeData Name="bg_activity_vip_daily_title_64" ActionTag="-1872609804" Tag="448" IconVisible="False" LeftMargin="71.4066" RightMargin="78.5934" TopMargin="2.5289" BottomMargin="457.4711" ctype="SpriteObjectData">

@@ -57,6 +57,40 @@
             <PreSize X="0.5889" Y="0.9491" />
             <PreSize X="0.5889" Y="0.9491" />
             <FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_month.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/shanghai_ctcc/bg_gift_month.png" Plist="" />
           </AbstractNodeData>
           </AbstractNodeData>
+          <AbstractNodeData Name="Image_3" ActionTag="-703146118" Tag="138" IconVisible="False" LeftMargin="97.8220" RightMargin="605.1780" TopMargin="327.3920" BottomMargin="128.6080" LeftEage="35" RightEage="35" TopEage="31" BottomEage="31" Scale9OriginX="35" Scale9OriginY="31" Scale9Width="37" Scale9Height="32" ctype="ImageViewObjectData">
+            <Size X="107.0000" Y="94.0000" />
+            <Children>
+              <AbstractNodeData Name="Image_4" ActionTag="-108830727" Tag="139" IconVisible="False" LeftMargin="3.2471" RightMargin="3.7529" TopMargin="-11.6169" BottomMargin="5.6169" LeftEage="33" RightEage="33" TopEage="33" BottomEage="33" Scale9OriginX="33" Scale9OriginY="33" Scale9Width="34" Scale9Height="34" ctype="ImageViewObjectData">
+                <Size X="100.0000" Y="100.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="53.2471" Y="55.6169" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.4976" Y="0.5917" />
+                <PreSize X="0.9346" Y="1.0638" />
+                <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg_1.png" Plist="" />
+              </AbstractNodeData>
+              <AbstractNodeData Name="Text_1" ActionTag="-1352944311" Tag="140" IconVisible="False" LeftMargin="-44.2517" RightMargin="-43.7483" TopMargin="57.7003" BottomMargin="6.2997" FontSize="24" LabelText="随机宠物技能石X1" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="195.0000" Y="30.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="53.2483" Y="21.2997" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.4976" Y="0.2266" />
+                <PreSize X="1.8224" Y="0.3191" />
+                <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
+                <OutlineColor A="255" R="30" G="144" B="255" />
+                <ShadowColor A="255" R="110" G="110" B="110" />
+              </AbstractNodeData>
+            </Children>
+            <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+            <Position X="151.3220" Y="175.6080" />
+            <Scale ScaleX="1.0000" ScaleY="1.0000" />
+            <CColor A="255" R="255" G="255" B="255" />
+            <PrePosition X="0.1868" Y="0.3193" />
+            <PreSize X="0.1321" Y="0.1709" />
+            <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg.png" Plist="" />
+          </AbstractNodeData>
           <AbstractNodeData Name="Image_57" ActionTag="-734408069" Tag="982" IconVisible="False" LeftMargin="409.0528" RightMargin="-17.0528" TopMargin="97.3033" BottomMargin="-69.3033" LeftEage="137" RightEage="137" TopEage="172" BottomEage="172" Scale9OriginX="137" Scale9OriginY="172" Scale9Width="144" Scale9Height="178" ctype="ImageViewObjectData">
           <AbstractNodeData Name="Image_57" ActionTag="-734408069" Tag="982" IconVisible="False" LeftMargin="409.0528" RightMargin="-17.0528" TopMargin="97.3033" BottomMargin="-69.3033" LeftEage="137" RightEage="137" TopEage="172" BottomEage="172" Scale9OriginX="137" Scale9OriginY="172" Scale9Width="144" Scale9Height="178" ctype="ImageViewObjectData">
             <Size X="418.0000" Y="522.0000" />
             <Size X="418.0000" Y="522.0000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
             <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
@@ -81,7 +115,7 @@
                 <FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
                 <FileData Type="Normal" Path="common/btn_green02_s.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
-              <AbstractNodeData Name="Text_2" ActionTag="-295270225" Tag="42" IconVisible="False" LeftMargin="26.5716" RightMargin="26.4284" TopMargin="14.2663" BottomMargin="14.7337" FontSize="26" LabelText="49元包月" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+              <AbstractNodeData Name="txt" ActionTag="-295270225" Tag="42" IconVisible="False" LeftMargin="26.5716" RightMargin="26.4284" TopMargin="14.2663" BottomMargin="14.7337" FontSize="26" LabelText="49元包月" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
                 <Size X="109.0000" Y="31.0000" />
                 <Size X="109.0000" Y="31.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="81.0716" Y="30.2337" />
                 <Position X="81.0716" Y="30.2337" />
@@ -485,25 +519,25 @@
           <AbstractNodeData Name="y_item_3" ActionTag="42590575" Tag="233" IconVisible="False" LeftMargin="559.5467" RightMargin="150.4533" TopMargin="276.6342" BottomMargin="173.3658" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
           <AbstractNodeData Name="y_item_3" ActionTag="42590575" Tag="233" IconVisible="False" LeftMargin="559.5467" RightMargin="150.4533" TopMargin="276.6342" BottomMargin="173.3658" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
             <Size X="100.0000" Y="100.0000" />
             <Size X="100.0000" Y="100.0000" />
             <Children>
             <Children>
-              <AbstractNodeData Name="icon" ActionTag="1181012539" Tag="240" IconVisible="False" LeftMargin="9.9999" RightMargin="10.0001" TopMargin="7.2831" BottomMargin="12.7169" ctype="SpriteObjectData">
-                <Size X="80.0000" Y="80.0000" />
+              <AbstractNodeData Name="icon" ActionTag="1181012539" Tag="240" IconVisible="False" LeftMargin="0.7331" RightMargin="-8.7331" TopMargin="-6.4001" BottomMargin="1.4001" ctype="SpriteObjectData">
+                <Size X="108.0000" Y="105.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
-                <Position X="49.9999" Y="52.7169" />
-                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <Position X="54.7331" Y="53.9001" />
+                <Scale ScaleX="0.6000" ScaleY="0.6000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
-                <PrePosition X="0.5000" Y="0.5272" />
-                <PreSize X="0.8000" Y="0.8000" />
-                <FileData Type="Normal" Path="icon/600001.png" Plist="" />
+                <PrePosition X="0.5473" Y="0.5390" />
+                <PreSize X="1.0800" Y="1.0500" />
+                <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg_2.png" Plist="" />
                 <BlendFunc Src="1" Dst="771" />
                 <BlendFunc Src="1" Dst="771" />
               </AbstractNodeData>
               </AbstractNodeData>
-              <AbstractNodeData Name="txt" ActionTag="-201570632" Tag="235" IconVisible="False" LeftMargin="24.8318" RightMargin="15.1682" TopMargin="54.6606" BottomMargin="15.3394" FontSize="24" LabelText="2000" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
-                <Size X="60.0000" Y="30.0000" />
+              <AbstractNodeData Name="txt" ActionTag="-201570632" Tag="235" IconVisible="False" LeftMargin="-30.6682" RightMargin="-40.3318" TopMargin="54.6606" BottomMargin="15.3394" FontSize="24" LabelText="随机宠物钥匙X1" HorizontalAlignmentType="HT_Center" VerticalAlignmentType="VT_Center" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="171.0000" Y="30.0000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
                 <Position X="54.8318" Y="30.3394" />
                 <Position X="54.8318" Y="30.3394" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <Scale ScaleX="1.0000" ScaleY="1.0000" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <CColor A="255" R="255" G="255" B="255" />
                 <PrePosition X="0.5483" Y="0.3034" />
                 <PrePosition X="0.5483" Y="0.3034" />
-                <PreSize X="0.6000" Y="0.3000" />
+                <PreSize X="1.7100" Y="0.3000" />
                 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
                 <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
                 <OutlineColor A="255" R="30" G="144" B="255" />
                 <OutlineColor A="255" R="30" G="144" B="255" />
                 <ShadowColor A="255" R="110" G="110" B="110" />
                 <ShadowColor A="255" R="110" G="110" B="110" />

@@ -77,6 +77,40 @@
             <PreSize X="0.8012" Y="0.3527" />
             <PreSize X="0.8012" Y="0.3527" />
             <FileData Type="Normal" Path="ui/Activity/tianjin_cucc/title_activity.png" Plist="" />
             <FileData Type="Normal" Path="ui/Activity/tianjin_cucc/title_activity.png" Plist="" />
           </AbstractNodeData>
           </AbstractNodeData>
+          <AbstractNodeData Name="Image_2" ActionTag="456633830" Tag="173" IconVisible="False" LeftMargin="290.5097" RightMargin="412.4903" TopMargin="332.4286" BottomMargin="123.5714" LeftEage="35" RightEage="35" TopEage="31" BottomEage="31" Scale9OriginX="35" Scale9OriginY="31" Scale9Width="37" Scale9Height="32" ctype="ImageViewObjectData">
+            <Size X="107.0000" Y="94.0000" />
+            <Children>
+              <AbstractNodeData Name="Image_4" ActionTag="-53370141" Tag="174" IconVisible="False" LeftMargin="3.5287" RightMargin="3.4713" TopMargin="-8.7979" BottomMargin="2.7979" LeftEage="33" RightEage="33" TopEage="33" BottomEage="33" Scale9OriginX="33" Scale9OriginY="33" Scale9Width="34" Scale9Height="34" ctype="ImageViewObjectData">
+                <Size X="100.0000" Y="100.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="53.5287" Y="52.7979" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.5003" Y="0.5617" />
+                <PreSize X="0.9346" Y="1.0638" />
+                <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg_1.png" Plist="" />
+              </AbstractNodeData>
+              <AbstractNodeData Name="Text_1" ActionTag="812821764" Tag="175" IconVisible="False" LeftMargin="-25.3318" RightMargin="-30.6682" TopMargin="52.9159" BottomMargin="15.0841" FontSize="20" LabelText="随机宠物技能石X1" OutlineEnabled="True" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="TextObjectData">
+                <Size X="163.0000" Y="26.0000" />
+                <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+                <Position X="56.1682" Y="28.0841" />
+                <Scale ScaleX="1.0000" ScaleY="1.0000" />
+                <CColor A="255" R="255" G="255" B="255" />
+                <PrePosition X="0.5249" Y="0.2988" />
+                <PreSize X="1.5234" Y="0.2766" />
+                <FontResource Type="Normal" Path="ui/font/fangzhengcuyuan.ttf" Plist="" />
+                <OutlineColor A="255" R="30" G="144" B="255" />
+                <ShadowColor A="255" R="110" G="110" B="110" />
+              </AbstractNodeData>
+            </Children>
+            <AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
+            <Position X="344.0097" Y="170.5714" />
+            <Scale ScaleX="1.2000" ScaleY="1.2000" />
+            <CColor A="255" R="255" G="255" B="255" />
+            <PrePosition X="0.4247" Y="0.3101" />
+            <PreSize X="0.1321" Y="0.1709" />
+            <FileData Type="Normal" Path="ui/Activity/icon_activity_vip_bg.png" Plist="" />
+          </AbstractNodeData>
           <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2830" RightMargin="336.7170" TopMargin="500.3858" BottomMargin="-10.3858" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
           <AbstractNodeData Name="btn_vip_lianxu" ActionTag="518028505" Tag="69" IconVisible="False" PositionPercentXEnabled="True" LeftMargin="311.2830" RightMargin="336.7170" TopMargin="500.3858" BottomMargin="-10.3858" TouchEnable="True" FontSize="14" Scale9Enable="True" LeftEage="15" RightEage="15" TopEage="11" BottomEage="11" Scale9OriginX="15" Scale9OriginY="11" Scale9Width="132" Scale9Height="38" ShadowOffsetX="2.0000" ShadowOffsetY="-2.0000" ctype="ButtonObjectData">
             <Size X="162.0000" Y="60.0000" />
             <Size X="162.0000" Y="60.0000" />
             <Children>
             <Children>

@@ -63,7 +63,7 @@
             <CColor A="255" R="255" G="255" B="255" />
             <CColor A="255" R="255" G="255" B="255" />
             <PrePosition X="0.5016" Y="0.7674" />
             <PrePosition X="0.5016" Y="0.7674" />
             <PreSize X="0.2352" Y="0.1042" />
             <PreSize X="0.2352" Y="0.1042" />
-            <FileData Type="Normal" Path="ui/medal/medal_item_title.png" Plist="" />
+            <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
           </AbstractNodeData>
           <AbstractNodeData Name="medal_name" ActionTag="-958402601" Tag="57" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="576.8519" RightMargin="568.1481" TopMargin="209.5280" BottomMargin="472.4720" ctype="SpriteObjectData">
           <AbstractNodeData Name="medal_name" ActionTag="-958402601" Tag="57" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="576.8519" RightMargin="568.1481" TopMargin="209.5280" BottomMargin="472.4720" ctype="SpriteObjectData">
@@ -74,7 +74,7 @@
             <CColor A="255" R="255" G="255" B="255" />
             <CColor A="255" R="255" G="255" B="255" />
             <PrePosition X="0.5034" Y="0.6826" />
             <PrePosition X="0.5034" Y="0.6826" />
             <PreSize X="0.1055" Y="0.0528" />
             <PreSize X="0.1055" Y="0.0528" />
-            <FileData Type="Normal" Path="ui/medal/medal_600001.png" Plist="" />
+            <FileData Type="Default" Path="Default/Sprite.png" Plist="" />
             <BlendFunc Src="1" Dst="771" />
             <BlendFunc Src="1" Dst="771" />
           </AbstractNodeData>
           </AbstractNodeData>
         </Children>
         </Children>

@@ -6,7 +6,6 @@
         <Folder Name="bg">
         <Folder Name="bg">
           <Image Name="bg_alert.png" />
           <Image Name="bg_alert.png" />
           <Image Name="bg_alert_title.png" />
           <Image Name="bg_alert_title.png" />
-          <Image Name="bg_exit.png" />
           <Image Name="bg_exit_1.png" />
           <Image Name="bg_exit_1.png" />
           <Image Name="bg_exit_2.png" />
           <Image Name="bg_exit_2.png" />
           <Image Name="bg_exit_pop.png" />
           <Image Name="bg_exit_pop.png" />
@@ -82,8 +81,6 @@
         </Folder>
         </Folder>
         <Folder Name="common_minigame">
         <Folder Name="common_minigame">
           <Image Name="bg_game_introduce.png" />
           <Image Name="bg_game_introduce.png" />
-          <Image Name="bg_game_pop.png" />
-          <Image Name="bg_game_pop2.png" />
           <Image Name="btn_again.png" />
           <Image Name="btn_again.png" />
           <Image Name="btn_cancel.png" />
           <Image Name="btn_cancel.png" />
           <Image Name="btn_cancel_s.png" />
           <Image Name="btn_cancel_s.png" />
@@ -119,11 +116,6 @@
             <ExportJsonFile Name="denglu.ExportJson" />
             <ExportJsonFile Name="denglu.ExportJson" />
           </Folder>
           </Folder>
           <Folder Name="buff">
           <Folder Name="buff">
-            <Folder Name=".svn">
-              <File Name="all-wcprops" />
-              <File Name="dir-prop-base" />
-              <File Name="entries" />
-            </Folder>
             <Folder Name="1">
             <Folder Name="1">
               <ExportJsonFile Name="1.ExportJson" />
               <ExportJsonFile Name="1.ExportJson" />
             </Folder>
             </Folder>
@@ -846,8 +838,6 @@
               <Image Name="title_activity.png" />
               <Image Name="title_activity.png" />
             </Folder>
             </Folder>
             <Image Name="achievement_yilingqu.png" />
             <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_gift_icon.png" />
             <Image Name="activity_lottery_select.png" />
             <Image Name="activity_lottery_select.png" />
             <Image Name="activity_renew.png" />
             <Image Name="activity_renew.png" />
@@ -953,13 +943,14 @@
             <Image Name="btn_vip_year_s.png" />
             <Image Name="btn_vip_year_s.png" />
             <Image Name="fnt_turntable_go.png" />
             <Image Name="fnt_turntable_go.png" />
             <Image Name="fnt_turntable_tomorrow.png" />
             <Image Name="fnt_turntable_tomorrow.png" />
+            <Image Name="icon_activity_vip_bg.png" />
+            <Image Name="icon_activity_vip_bg_1.png" />
+            <Image Name="icon_activity_vip_bg_2.png" />
             <Image Name="icon_coin.png" />
             <Image Name="icon_coin.png" />
             <Image Name="icon_vip_xufei.png" />
             <Image Name="icon_vip_xufei.png" />
             <Image Name="img_activity_seven_get.png" />
             <Image Name="img_activity_seven_get.png" />
             <Image Name="img_activity_seven_light.png" />
             <Image Name="img_activity_seven_light.png" />
-            <Image Name="img_activity_vip_daily.png" />
             <Image Name="img_daily_lottery_check.png" />
             <Image Name="img_daily_lottery_check.png" />
-            <Image Name="img_no_activity.png" />
             <Image Name="leaf01.png" />
             <Image Name="leaf01.png" />
             <Image Name="leaf02.png" />
             <Image Name="leaf02.png" />
             <Image Name="leaf03.png" />
             <Image Name="leaf03.png" />
@@ -980,8 +971,6 @@
             <Project Name="ChenghaoGetLayer.csd" Type="Layer" />
             <Project Name="ChenghaoGetLayer.csd" Type="Layer" />
             <Project Name="ChenghaoItem.csd" Type="Layer" />
             <Project Name="ChenghaoItem.csd" Type="Layer" />
             <Project Name="ChenghaoLayer.csd" Type="Layer" />
             <Project Name="ChenghaoLayer.csd" Type="Layer" />
-            <Image Name="icon_1.png" />
-            <Image Name="icon_2.png" />
             <Image Name="icon_3.png" />
             <Image Name="icon_3.png" />
             <Image Name="txt_title.png" />
             <Image Name="txt_title.png" />
           </Folder>
           </Folder>
@@ -1264,15 +1253,6 @@
             <Image Name="word_ylc.png" />
             <Image Name="word_ylc.png" />
             <Image Name="word_ylc_1.png" />
             <Image Name="word_ylc_1.png" />
           </Folder>
           </Folder>
-          <Folder Name="medal">
-            <Image Name="medal_600001.png" />
-            <Image Name="medal_600002.png" />
-            <Image Name="medal_600003.png" />
-            <Image Name="medal_600004.png" />
-            <Image Name="medal_600005.png" />
-            <Image Name="medal_item_title.png" />
-            <Image Name="medal_light_img.png" />
-          </Folder>
           <Folder Name="notice">
           <Folder Name="notice">
             <Image Name="bg_notice.png" />
             <Image Name="bg_notice.png" />
             <Project Name="NoticeItem1.csd" Type="Layer" />
             <Project Name="NoticeItem1.csd" Type="Layer" />
@@ -1510,7 +1490,6 @@
             <Image Name="bg_item_3.png" />
             <Image Name="bg_item_3.png" />
             <Image Name="bg_xyx.png" />
             <Image Name="bg_xyx.png" />
             <Image Name="bg_xyx_1.png" />
             <Image Name="bg_xyx_1.png" />
-            <Image Name="bg_xyx_buy.png" />
             <Image Name="bg_xyx_head.png" />
             <Image Name="bg_xyx_head.png" />
             <Image Name="bg_xyx_pk_vip_jia.png" />
             <Image Name="bg_xyx_pk_vip_jia.png" />
             <Image Name="bg_xyx_rank.png" />
             <Image Name="bg_xyx_rank.png" />

@@ -28,14 +28,5 @@
         <LastRunType Value="Windows" />
         <LastRunType Value="Windows" />
       </Value>
       </Value>
     </Item>
     </Item>
-    <Item Key="TabsParamsKey">
-      <Value ctype="TabsInfo">
-        <OpenedDocuments>
-          <FilePathData Path="ui/dress/PetDetail.csd" />
-          <FilePathData Path="ui/dress/PetFeedLayer.csd" />
-        </OpenedDocuments>
-        <ActiveDocument Path="ui/dress/PetDetail.csd" />
-      </Value>
-    </Item>
   </Properties>
   </Properties>
 </UserData>
 </UserData>
\ No newline at end of file

@@ -74,6 +74,7 @@ enum USER_EVENT_TYPE
 	DAILY_EVENT_PLAY_PK_CNT    				= 10000024;//每日pk次数 id:0, data:次数
 	DAILY_EVENT_PLAY_PK_CNT    				= 10000024;//每日pk次数 id:0, data:次数
 	
 	
 	DAILY_EVENT_PK_ADD_EXP_CNT    			= 10000025;//每日pk获得exp数量 id:0, data:exp获得数量
 	DAILY_EVENT_PK_ADD_EXP_CNT    			= 10000025;//每日pk获得exp数量 id:0, data:exp获得数量
+	DAILY_EVENT_SINGLE_GAME_CNT    			= 10000026;//每日游戏次数 id:game_id, data:数量
 	DAILY_EVENT_END							= 19999999;
 	DAILY_EVENT_END							= 19999999;
 	//---------------------------------------------------------------------------- 
 	//---------------------------------------------------------------------------- 
 
 
@@ -113,7 +114,7 @@ enum USER_EVENT_TYPE
 	FOREVER_EVENT_FIRST_PAY				= 40000007;//首充,id:pay.xml中的id
 	FOREVER_EVENT_FIRST_PAY				= 40000007;//首充,id:pay.xml中的id
 	FOREVER_EVENT_GAME_SCORE			= 40000008;//游戏分数 id:游戏id, data:分数
 	FOREVER_EVENT_GAME_SCORE			= 40000008;//游戏分数 id:游戏id, data:分数
 	FOREVER_EVENT_MAIL_VERSION_REWARD	= 40000009;//邮件 版本 奖励,id:邮件ID
 	FOREVER_EVENT_MAIL_VERSION_REWARD	= 40000009;//邮件 版本 奖励,id:邮件ID
-	FOREVER_EVENT_FREE_GAME_ID_PAY		= 40000010;//准备购买游戏,id:0, data:游戏ID
+//	FOREVER_EVENT_FREE_GAME_ID_PAY		= 40000010;//准备购买游戏,id:0, data:游戏ID
 	FOREVER_EVENT_FREE_GAME_ID			= 40000011;//买断的游戏,id:游戏ID
 	FOREVER_EVENT_FREE_GAME_ID			= 40000011;//买断的游戏,id:游戏ID
 	FOREVER_EVENT_VIP_PAY_REWARD		= 40000012;//已领取的  vip 按时间充值活动(每个时间段充值,只能领取一次),id:vip_pay_reward.xml中的id
 	FOREVER_EVENT_VIP_PAY_REWARD		= 40000012;//已领取的  vip 按时间充值活动(每个时间段充值,只能领取一次),id:vip_pay_reward.xml中的id
 	FOREVER_EVENT_FIRST_GAME			= 40000013;//第一次玩小游戏,id:0
 	FOREVER_EVENT_FIRST_GAME			= 40000013;//第一次玩小游戏,id:0
@@ -184,7 +185,7 @@ enum USER_EVENT_TYPE
 	EXPRIE_EVENT_RANK_REWARD							= 90000008;	  //过期排行领取过奖励,id:rank_exprie_reward.xml id ,time:过期时间
 	EXPRIE_EVENT_RANK_REWARD							= 90000008;	  //过期排行领取过奖励,id:rank_exprie_reward.xml id ,time:过期时间
 	EXPRIE_EVENT_RANK_GAME_CNT							= 90000009;	  //过期排行,游戏次数,id:rank_exprie_reward.xml id ,data:次数,time:过期时间,str_data:是否领取过(有数据就是领取过)
 	EXPRIE_EVENT_RANK_GAME_CNT							= 90000009;	  //过期排行,游戏次数,id:rank_exprie_reward.xml id ,data:次数,time:过期时间,str_data:是否领取过(有数据就是领取过)
 	
 	
-	EXPRIE_EVENT_FREE_GAME_ID							= 90000010;	  //准备购买游戏,id:游戏ID, time:过期时间
+	//EXPRIE_EVENT_FREE_GAME_ID							= 90000010;	  //准备购买游戏,id:游戏ID, time:过期时间
 	EXPRIE_EVENT_END									= 99999999;
 	EXPRIE_EVENT_END									= 99999999;
 	
 	
 	//---------------------------------------------------------------------------- 
 	//---------------------------------------------------------------------------- 
@@ -218,6 +219,7 @@ enum E_STATISTICS_TYPE
 
 
 	
 	
 
 
+
 }
 }
 
 
 //聊天类型ok
 //聊天类型ok

@@ -161,9 +161,9 @@ message update_pet_msg//0,0x1001040c#更新宠物
 	optional share_msg.pet_t pet = 1;
 	optional share_msg.pet_t pet = 1;
 }
 }
 
 
-message update_pay_game_id_msg//0,0x1001040e#更新购买的小游戏
-{
-}
+//message update_pay_game_id_msg//0,0x1001040e#更新购买的小游戏
+//{
+//}
 
 
 	//////////////////////////////////////////////////////
 	//////////////////////////////////////////////////////
 	//系统消息<date start="0x10010a00" end="0x10010aff" />
 	//系统消息<date start="0x10010a00" end="0x10010aff" />

@@ -78,7 +78,7 @@ message login_msg_res
 	optional uint32	pet_btl_exp = 34;//出战宠物,胜点//[废弃]
 	optional uint32	pet_btl_exp = 34;//出战宠物,胜点//[废弃]
 	//optional uint32	pet_btl_time = 35;//可出战宠物,时间
 	//optional uint32	pet_btl_time = 35;//可出战宠物,时间
 	repeated uint32 received_duanwei_lv_reward = 36;//领取过的段位等级奖励
 	repeated uint32 received_duanwei_lv_reward = 36;//领取过的段位等级奖励
-	repeated uint32 free_game_id = 37;//可玩的包月小游戏
+	//repeated uint32 free_game_id = 37;//可玩的包月小游戏
 	repeated uint32 vip_pay_reward = 38;//vip 按时间充值活动(每个时间段充值,只能领取一次)
 	repeated uint32 vip_pay_reward = 38;//vip 按时间充值活动(每个时间段充值,只能领取一次)
 	optional uint32 pet_level_max_cnt = 40;//宠物满级数量
 	optional uint32 pet_level_max_cnt = 40;//宠物满级数量
 	optional uint32 shanchang_game_id = 41;//擅长游戏ID(0:无)
 	optional uint32 shanchang_game_id = 41;//擅长游戏ID(0:无)
@@ -94,6 +94,7 @@ message login_msg_res
 	optional uint32	pk_daily_cnt = 50;//每日已pk次数
 	optional uint32	pk_daily_cnt = 50;//每日已pk次数
 	
 	
 	repeated share_msg.key_val_t active_data = 51;//活动信息  key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
 	repeated share_msg.key_val_t active_data = 51;//活动信息  key:active.xml中的id,v1:状态(0:未完成, 1:完成未领取, 2:完成已领取)
+	repeated share_msg.key_val_t single_game_cnt = 52;//小游戏免费使用过的次数  key:小游戏id,v1:次数
 }
 }
 
 
 message create_role_msg//1,0x00104#创建角色
 message create_role_msg//1,0x00104#创建角色
@@ -195,6 +196,8 @@ message shanghai_dianxin_pay_msg//1,0x00353#上海电信支付成功
 
 
 message shanghai_dianxin_pay_msg_res
 message shanghai_dianxin_pay_msg_res
 {
 {
+	//支付,按天数领取
+	repeated share_msg.key_val_t pay_day = 17;//v1:上一次领取时间.v2:过期时间.v3:购买的时间(秒)
 }
 }
 
 
 message single_game_info_msg//1,0x00354#获取游戏信息
 message single_game_info_msg//1,0x00354#获取游戏信息
@@ -245,14 +248,14 @@ message get_vip_pay_reward_msg_res
 {
 {
 }
 }
 
 
-message notify_pay_succ_single_game_msg//0,0x00359#通知小游戏购买成功
-{
-}
+//message notify_pay_succ_single_game_msg//0,0x00359#通知小游戏购买成功
+//{
+//}
 
 
-message notify_pay_succ_single_game_msg_res
-{
-	optional uint32 free_game_id = 37;//可玩的包月小游戏
-}
+//message notify_pay_succ_single_game_msg_res
+//{
+//	optional uint32 free_game_id = 37;//可玩的包月小游戏
+//}
 
 
 message get_peer_user_info_msg//1,0x0035a#获取对方玩家信息
 message get_peer_user_info_msg//1,0x0035a#获取对方玩家信息
 {
 {

@@ -49,7 +49,7 @@ message pay_get_id_msg_res
 //	optional string zfb_url_callback = 4; //支付宝回调URL
 //	optional string zfb_url_callback = 4; //支付宝回调URL
 //	optional string wx_url_callback = 5; //微信回调URL
 //	optional string wx_url_callback = 5; //微信回调URL
 	
 	
-	optional uint32 game_id = 6;//购买的游戏ID
+	optional uint32 game_id = 6;//废弃,购买的游戏ID
 }
 }
 
 
 message pay_succ_msg//1,0x50003#购买成功
 message pay_succ_msg//1,0x50003#购买成功