Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 56f657f2 56f657f224a46b43180c48e680fcd3bad1d92e04 by jinwawa
Options

0523

1 parent 459300e8
Expand all
Inline Side-by-side
Showing 165 changed files with 1220 additions and 39 deletions
......@@ -32,16 +32,7 @@
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/candy/LoadingScene.csd" />
<FilePathData Path="ui/candy/GameScene.csd" />
<FilePathData Path="ui/candy/GameStartLayer.csd" />
<FilePathData Path="ui/candy/Girl.csd" />
<FilePathData Path="ui/candy/GameOverLayer.csd" />
<FilePathData Path="ui/candy/GamePayLayer.csd" />
<FilePathData Path="ui/candy/GameFailLayer.csd" />
<FilePathData Path="ui/candy/GamePayConfirmLayer.csd" />
<FilePathData Path="ui/candy/Girl_shdx.csd" />
<FilePathData Path="ui/candy/GameStartLayer_shdx.csd" />
<FilePathData Path="ui/candy/LoadingScene_shdx.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/candy/GameStartLayer.csd" />
</Value>
......
......@@ -27,17 +27,6 @@
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="ui/candy/NewAnimation_candy/jietangguo.ExportJson" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="girl_2" Visible="False" ActionTag="-3534560" VisibleForFrame="False" Tag="54" IconVisible="False" LeftMargin="519.5000" RightMargin="519.5000" TopMargin="400.0000" ctype="SpriteObjectData">
<Size X="241.0000" Y="320.0000" />
<AnchorPoint ScaleX="0.5000" />
<Position X="640.0000" />
<Scale ScaleX="1.2000" ScaleY="1.2000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" />
<PreSize X="0.1883" Y="0.4444" />
<FileData Type="Normal" Path="ui/candy/girl.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="bg_mask" Visible="False" ActionTag="1223923180" Tag="63" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" TouchEnable="True" ClipAble="False" BackColorAlpha="127" ComboBoxIndex="1" ColorAngle="90.0000" Scale9Width="1" Scale9Height="1" ctype="PanelObjectData">
<Size X="1280.0000" Y="720.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
......
......@@ -27,17 +27,6 @@
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="ui/candy/NewAnimation_candy/jietangguo.ExportJson" Plist="" />
</AbstractNodeData>
<AbstractNodeData Name="girl_2" ActionTag="-154795064" Tag="53" IconVisible="False" LeftMargin="519.5000" RightMargin="519.5000" TopMargin="400.0000" ctype="SpriteObjectData">
<Size X="241.0000" Y="320.0000" />
<AnchorPoint ScaleX="0.5000" />
<Position X="640.0000" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.5000" />
<PreSize X="0.1883" Y="0.4444" />
<FileData Type="Normal" Path="ui/candy/girl.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="LoadingBar" ActionTag="-170014364" Tag="109" IconVisible="False" PositionPercentXEnabled="True" PositionPercentYEnabled="True" LeftMargin="374.8320" RightMargin="325.1680" TopMargin="581.6320" BottomMargin="80.3680" TouchEnable="True" ClipAble="False" BackColorAlpha="102" ColorAngle="90.0000" LeftEage="191" RightEage="191" TopEage="19" BottomEage="19" Scale9OriginX="191" Scale9OriginY="19" Scale9Width="198" Scale9Height="20" ctype="PanelObjectData">
<Size X="580.0000" Y="58.0000" />
<Children>
......
......@@ -28,5 +28,14 @@
<LastRunType Value="Windows" />
</Value>
</Item>
<Item Key="TabsParamsKey">
<Value ctype="TabsInfo">
<OpenedDocuments>
<FilePathData Path="ui/fanpai/LoadingScene.csd" />
<FilePathData Path="ui/fanpai/GameStartLayer.csd" />
</OpenedDocuments>
<ActiveDocument Path="ui/fanpai/GameStartLayer.csd" />
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
......@@ -28,13 +28,13 @@
<FileData Type="Normal" Path="ui/haidao/img_game_hero_show.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
<AbstractNodeData Name="ArmatureNode_1" ActionTag="-1875446877" Tag="394" IconVisible="True" LeftMargin="613.3229" RightMargin="666.6771" TopMargin="369.0883" BottomMargin="350.9117" IsLoop="True" IsAutoPlay="True" CurrentAnimationName="Animation1" ctype="ArmatureNodeObjectData">
<AbstractNodeData Name="ArmatureNode_1" ActionTag="-1875446877" Tag="394" IconVisible="True" LeftMargin="642.3234" RightMargin="637.6766" TopMargin="369.0882" BottomMargin="350.9118" IsLoop="True" IsAutoPlay="True" CurrentAnimationName="Animation1" ctype="ArmatureNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<AnchorPoint />
<Position X="613.3229" Y="350.9117" />
<Position X="642.3234" Y="350.9118" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition X="0.4792" Y="0.4874" />
<PrePosition X="0.5018" Y="0.4874" />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="ui/haidao/NewAnimation_pirate/xuanzhuanhaidao.ExportJson" Plist="" />
</AbstractNodeData>
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
<Value ctype="GuidesData">
<VerticalList>
<Guides Position="68.8638" />
</VerticalList>
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
<Value ctype="GuidesData">
<VerticalList>
<Guides Position="71.6745" />
</VerticalList>
</Value>
</Item>
</Properties>
</UserData>
\ No newline at end of file
......

292 KB | W: | H:

245 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>foxhead_2.png</key>
<dict>
<key>width</key>
<integer>138</integer>
<key>height</key>
<integer>140</integer>
<key>originalWidth</key>
<integer>138</integer>
<key>originalHeight</key>
<integer>140</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffehead_3.png</key>
<dict>
<key>width</key>
<integer>160</integer>
<key>height</key>
<integer>131</integer>
<key>originalWidth</key>
<integer>160</integer>
<key>originalHeight</key>
<integer>131</integer>
<key>x</key>
<integer>140</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffehead_2.png</key>
<dict>
<key>width</key>
<integer>160</integer>
<key>height</key>
<integer>131</integer>
<key>originalWidth</key>
<integer>160</integer>
<key>originalHeight</key>
<integer>131</integer>
<key>x</key>
<integer>302</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffehead_1.png</key>
<dict>
<key>width</key>
<integer>160</integer>
<key>height</key>
<integer>131</integer>
<key>originalWidth</key>
<integer>160</integer>
<key>originalHeight</key>
<integer>131</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffebody_1.png</key>
<dict>
<key>width</key>
<integer>56</integer>
<key>height</key>
<integer>124</integer>
<key>originalWidth</key>
<integer>56</integer>
<key>originalHeight</key>
<integer>124</integer>
<key>x</key>
<integer>162</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffegang_1.png</key>
<dict>
<key>width</key>
<integer>151</integer>
<key>height</key>
<integer>44</integer>
<key>originalWidth</key>
<integer>151</integer>
<key>originalHeight</key>
<integer>44</integer>
<key>x</key>
<integer>220</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffehand_1.png</key>
<dict>
<key>width</key>
<integer>34</integer>
<key>height</key>
<integer>21</integer>
<key>originalWidth</key>
<integer>34</integer>
<key>originalHeight</key>
<integer>21</integer>
<key>x</key>
<integer>373</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffehand_2.png</key>
<dict>
<key>width</key>
<integer>33</integer>
<key>height</key>
<integer>21</integer>
<key>originalWidth</key>
<integer>34</integer>
<key>originalHeight</key>
<integer>21</integer>
<key>x</key>
<integer>409</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>-0.5</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>giraffetail_1.png</key>
<dict>
<key>width</key>
<integer>46</integer>
<key>height</key>
<integer>25</integer>
<key>originalWidth</key>
<integer>46</integer>
<key>originalHeight</key>
<integer>25</integer>
<key>x</key>
<integer>444</integer>
<key>y</key>
<integer>142</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandahead_2.png</key>
<dict>
<key>width</key>
<integer>178</integer>
<key>height</key>
<integer>103</integer>
<key>originalWidth</key>
<integer>179</integer>
<key>originalHeight</key>
<integer>103</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>275</integer>
<key>offsetX</key>
<real>0.5</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandahead_1.png</key>
<dict>
<key>width</key>
<integer>179</integer>
<key>height</key>
<integer>103</integer>
<key>originalWidth</key>
<integer>179</integer>
<key>originalHeight</key>
<integer>103</integer>
<key>x</key>
<integer>180</integer>
<key>y</key>
<integer>275</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandahand_2.png</key>
<dict>
<key>width</key>
<integer>36</integer>
<key>height</key>
<integer>29</integer>
<key>originalWidth</key>
<integer>36</integer>
<key>originalHeight</key>
<integer>29</integer>
<key>x</key>
<integer>361</integer>
<key>y</key>
<integer>275</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandahand_1.png</key>
<dict>
<key>width</key>
<integer>36</integer>
<key>height</key>
<integer>29</integer>
<key>originalWidth</key>
<integer>36</integer>
<key>originalHeight</key>
<integer>29</integer>
<key>x</key>
<integer>399</integer>
<key>y</key>
<integer>275</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandabody_1.png</key>
<dict>
<key>width</key>
<integer>97</integer>
<key>height</key>
<integer>76</integer>
<key>originalWidth</key>
<integer>97</integer>
<key>originalHeight</key>
<integer>76</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandaarm_2.png</key>
<dict>
<key>width</key>
<integer>28</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>28</integer>
<key>originalHeight</key>
<integer>30</integer>
<key>x</key>
<integer>99</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandaarm_1.png</key>
<dict>
<key>width</key>
<integer>28</integer>
<key>height</key>
<integer>30</integer>
<key>originalWidth</key>
<integer>28</integer>
<key>originalHeight</key>
<integer>30</integer>
<key>x</key>
<integer>129</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandaleg_2.png</key>
<dict>
<key>width</key>
<integer>31</integer>
<key>height</key>
<integer>47</integer>
<key>originalWidth</key>
<integer>31</integer>
<key>originalHeight</key>
<integer>47</integer>
<key>x</key>
<integer>159</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandaleg_1.png</key>
<dict>
<key>width</key>
<integer>31</integer>
<key>height</key>
<integer>47</integer>
<key>originalWidth</key>
<integer>31</integer>
<key>originalHeight</key>
<integer>47</integer>
<key>x</key>
<integer>192</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>Lesserpandatail_1.png</key>
<dict>
<key>width</key>
<integer>111</integer>
<key>height</key>
<integer>54</integer>
<key>originalWidth</key>
<integer>111</integer>
<key>originalHeight</key>
<integer>54</integer>
<key>x</key>
<integer>225</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>sheephead_2.png</key>
<dict>
<key>width</key>
<integer>154</integer>
<key>height</key>
<integer>121</integer>
<key>originalWidth</key>
<integer>155</integer>
<key>originalHeight</key>
<integer>122</integer>
<key>x</key>
<integer>338</integer>
<key>y</key>
<integer>380</integer>
<key>offsetX</key>
<real>0.5</real>
<key>offsetY</key>
<real>-0.5</real>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>0</integer>
<key>textureFileName</key>
<string>denglu1.png</string>
<key>realTextureFileName</key>
<string>denglu1.png</string>
<key>size</key>
<string>{512,512}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>512</integer>
<key>height</key>
<integer>512</integer>
</dict>
</dict>
</plist>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>sheephead_1.png</key>
<dict>
<key>width</key>
<integer>154</integer>
<key>height</key>
<integer>121</integer>
<key>originalWidth</key>
<integer>155</integer>
<key>originalHeight</key>
<integer>122</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0.5</real>
<key>offsetY</key>
<real>-0.5</real>
</dict>
<key>sheephand_2.png</key>
<dict>
<key>width</key>
<integer>21</integer>
<key>height</key>
<integer>46</integer>
<key>originalWidth</key>
<integer>21</integer>
<key>originalHeight</key>
<integer>46</integer>
<key>x</key>
<integer>156</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>sheephand_1.png</key>
<dict>
<key>width</key>
<integer>21</integer>
<key>height</key>
<integer>46</integer>
<key>originalWidth</key>
<integer>21</integer>
<key>originalHeight</key>
<integer>46</integer>
<key>x</key>
<integer>179</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>sheepbody_1.png</key>
<dict>
<key>width</key>
<integer>63</integer>
<key>height</key>
<integer>86</integer>
<key>originalWidth</key>
<integer>63</integer>
<key>originalHeight</key>
<integer>86</integer>
<key>x</key>
<integer>202</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>sheepleg_1.png</key>
<dict>
<key>width</key>
<integer>19</integer>
<key>height</key>
<integer>27</integer>
<key>originalWidth</key>
<integer>19</integer>
<key>originalHeight</key>
<integer>27</integer>
<key>x</key>
<integer>267</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>sheepleg_2.png</key>
<dict>
<key>width</key>
<integer>19</integer>
<key>height</key>
<integer>27</integer>
<key>originalWidth</key>
<integer>19</integer>
<key>originalHeight</key>
<integer>27</integer>
<key>x</key>
<integer>288</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>0</integer>
<key>textureFileName</key>
<string>denglu2.png</string>
<key>realTextureFileName</key>
<string>denglu2.png</string>
<key>size</key>
<string>{512,512}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>512</integer>
<key>height</key>
<integer>512</integer>
</dict>
</dict>
</plist>
\ No newline at end of file
......@@ -972,12 +972,14 @@ function UserModel.getAchievementNum()
for i,v in ipairs(UserModel.achievement) do
print("get achievement info:",v.type_id);
local achievement_info = AchievementInfo.getAchievementListByID(v.type_id);
if achievement_info then
for ii,vv in ipairs(achievement_info.list) do
if v.data >= tonumber(vv.data) then
num = num + 1;
end
end
end
end
return num;
end
......@@ -995,12 +997,14 @@ function UserModel.hasAchivementReward()
for i,achievement_data in ipairs(UserModel.achievement) do
print("achievement_data.type_id",achievement_data.type_id)
local achievement_info = AchievementInfo.getAchievementListByID(achievement_data.type_id);
if achievement_info then
for ii,vv in ipairs(achievement_info.list) do
if achievement_data.data >= vv.data and not TableUtil.IsInTable(achievement_data.get_reward_id,ii) then
b = true;
end
end
end
end
return b;
end
......
......@@ -24,6 +24,8 @@ function MainScene:onCreate(params)
self.ui = cc.CSLoader:createNode("ui/MainScene.csb");
self:addChild(self.ui);
self.ui:setContentSize(cc.size(display.width, display.height));
ccui.Helper:doLayout(self.ui);
......
......@@ -106,13 +106,27 @@ function AchievementView:updateItems()
local list_nodes = { };
local _list = AchievementInfo.getAchievementList();
if NEED_PAY==0 then --支付模式去掉钻石积累
for i =1,#_list do
if _list[i] and _list[i].viewid==5 then
table.remove(_list,i);
end
if _list[i] and _list[i].viewid==10 then
table.remove(_list,i);
end
end
end
local _y = #_list * 260;
if _y < 500 then
_y = 500;
end
for i = 1, #_list do
local info = _list[i];
if info then
logD("viewid---------------------"..info.viewid);
local achievement_data = UserModel.getAchievementByID(info.id);
list_nodes[i] = { };
for ii, vv in ipairs(info.list) do
......@@ -271,6 +285,18 @@ function AchievementView:setScrollPosition(node)
local scrollSize = self.scrollView:getContentSize();
local _list = AchievementInfo.getAchievementList();
if NEED_PAY==0 then --支付模式去掉钻石积累
for i =1,#_list do
if _list[i] and _list[i].viewid==5 then
table.remove(_list,i);
end
if _list[i] and _list[i].viewid==10 then
table.remove(_list,i);
end
end
end
local len = #_list * 260;
local currentX = len -(node:getPositionY()+260+20);
......
......@@ -83,9 +83,9 @@ function ActivityView:initActivity()
act_tab_list = {}; --{id=11001,title="7日礼包",order=3,act="ActivitySevenView",flag=""},...
for i,v in ipairs(GameConfig.activityList) do
if v.act == "ActivityGameLotteryView" then --对局福利
if v.act == "ActivityGameLotteryView" then --对局抽奖
act_tab_list[#act_tab_list+1] = v;
elseif v.act == "ActivitySevenView" then --7日礼包
elseif v.act == "ActivitySevenView" then --新手7日礼包
if UserModel.role_reward < 7 then
act_tab_list[#act_tab_list+1] = v;
end
......@@ -111,9 +111,12 @@ function ActivityView:initActivity()
end
end
else
if NEED_PAY==0 and v.act == "ActivityVipView" then --0支付模式不能访问活动礼包
else
act_tab_list[#act_tab_list+1] = v;
end
end
end
if not self.activityName then
self.activityName = "ActivityVipView";
......@@ -145,6 +148,7 @@ function ActivityView:initActivity()
end
for i=0,#act_tab_list-1 do
local info = act_tab_list[i+1];
--logD("id--------------->"..info.id);
if info then
local item = cc.CSLoader:createNode("ui/Activity/ActivityItem.csb");
item:setPosition(cc.p(85,_y - 10 - (i+1)*100));
......
......@@ -85,7 +85,7 @@ function RoleBussinessView:init(_nodes, _update_nodes_func, _update_nodes_state_
end
-- logUI(shanchang_game.."---<RoleBussinessView --shanchanggame--------->"..ruoxiang_game);
self.btn_wx = self:getChildByName("btn_wx");
if GameConfig.is_open_wx_login and UserModel.login_type == 0 then
if GameConfig.is_open_wx_login and UserModel.login_type == 0 and NEED_PAY==1 then
self.btn_wx.fn = function()
self:onWxClick(self.btn_wx);
end;
......@@ -273,6 +273,11 @@ function RoleBussinessView:update()
-- self.btn_vip.id = vipList[1].id;
self.nodes = TableUtil.merge(self.nodes_copy, { _nodes });
end
if NEED_PAY==0 then
self:getChildByName("txt_expire"):setVisible(false);
end
if self.update_nodes_func then
self.update_nodes_func(self.nodes);
end
......
......@@ -40,6 +40,9 @@ function RoleMainView:init()
self.nodes[2] = { };
for i = 1, 5 do
local tab = self:getChildByName("tab_" .. i);
if NEED_PAY==0 and i==5 then
tab:setVisible(false);
else
tab:setSwallowTouches(false);
tab.is_tab = true;
tab.is_vertical_tab = true;
......@@ -53,6 +56,7 @@ function RoleMainView:init()
self.selected_node = tab;
end
end
end
self.nodes_copy = TableUtil.copyTab(self.nodes);
......
......@@ -17,6 +17,7 @@ function ShopView:ctor()
end
function ShopView:show(shopType)
shopItemType = shopType or 1;
local scene = cc.Director:getInstance():getRunningScene()
local inst = ShopView:create();
......@@ -67,6 +68,11 @@ function ShopView:init()
self.nodes[2] = {};
for i=1,6 do
local tab = self.panel:getChildByName("tab_"..i);
--判断是否支持支付模式
if NEED_PAY==0 and i==5 or i==6 then --隐藏金豆、钻石
tab:setVisible(false);
else
tab:setTag(i);
tab.is_tab = true;
tab.is_horizontal = true;
......@@ -77,6 +83,7 @@ function ShopView:init()
tab:addTouchEventListener(function(ref,type) self:onButtonClick(ref,type, handler(self,self.onTabClick))end);
self.nodes[2][#self.nodes[2]+1] = tab;
end
end
local btn_pre = self.panel:getChildByName("btn_pre");
btn_pre.fn = handler(self,self.onPre);
......
......@@ -49,12 +49,21 @@ function TaskView:update()
self.list = UserModel.getTaskList();
if NEED_PAY==0 then --支付模式去除钻石任务
for i=0,#self.list-1 do
if self.list[i + 1] and self.list[i + 1].id==10 then
table.remove(self.list,i+1);
end
end
end
local _y = #self.list * 160;
if _y < 500 then
_y = 500;
end
for i = 0, #self.list - 1 do
local data = self.list[i + 1];
logD("taskid------------------------->"..data.id);
local taskItem = self.scrollView:getChildByName("task_" .. data.id);
if not taskItem then
taskItem = cc.CSLoader:createNode("ui/task/TaskItem.csb");
......
......@@ -97,6 +97,10 @@ function XyxView:updateItems()
item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
end
if NEED_PAY==0 then
item:getChildByName("panel"):getChildByName("flag"):setVisible(false);
end
local btn = item:getChildByName("btn");
btn.fn = function ()
self:onBtnClick(btn);
......
......@@ -27,6 +27,7 @@ local function main()
PROXY_HTTP_ADDR = ConfigInfo.getConfigInfo("proxy_http_addr");
PROXY_SOCK_ADDR = ConfigInfo.getConfigInfo("proxy_sock_addr");
IS_TV = tonumber(ConfigInfo.getConfigInfo("is_tv"));
NEED_PAY=tonumber(ConfigInfo.getConfigInfo("need_pay")); --是否需要支付模式
require "core.log.init";
require "core.net.socket_connection";
......
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>位图 3.png</key>
<dict>
<key>width</key>
<integer>149</integer>
<key>height</key>
<integer>102</integer>
<key>originalWidth</key>
<integer>149</integer>
<key>originalHeight</key>
<integer>102</integer>
<key>x</key>
<integer>0</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>位图 4.png</key>
<dict>
<key>width</key>
<integer>143</integer>
<key>height</key>
<integer>115</integer>
<key>originalWidth</key>
<integer>143</integer>
<key>originalHeight</key>
<integer>115</integer>
<key>x</key>
<integer>151</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0005_图层-60773.png</key>
<dict>
<key>width</key>
<integer>13</integer>
<key>height</key>
<integer>19</integer>
<key>originalWidth</key>
<integer>13</integer>
<key>originalHeight</key>
<integer>19</integer>
<key>x</key>
<integer>296</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0008_组-10.png</key>
<dict>
<key>width</key>
<integer>31</integer>
<key>height</key>
<integer>31</integer>
<key>originalWidth</key>
<integer>31</integer>
<key>originalHeight</key>
<integer>31</integer>
<key>x</key>
<integer>311</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0004_图层-60772.png</key>
<dict>
<key>width</key>
<integer>14</integer>
<key>height</key>
<integer>19</integer>
<key>originalWidth</key>
<integer>14</integer>
<key>originalHeight</key>
<integer>19</integer>
<key>x</key>
<integer>344</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0007_图层-60777.png</key>
<dict>
<key>width</key>
<integer>31</integer>
<key>height</key>
<integer>32</integer>
<key>originalWidth</key>
<integer>31</integer>
<key>originalHeight</key>
<integer>32</integer>
<key>x</key>
<integer>360</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0003_图层-60771.png</key>
<dict>
<key>width</key>
<integer>13</integer>
<key>height</key>
<integer>18</integer>
<key>originalWidth</key>
<integer>13</integer>
<key>originalHeight</key>
<integer>18</integer>
<key>x</key>
<integer>393</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0002_图层-60770.png</key>
<dict>
<key>width</key>
<integer>14</integer>
<key>height</key>
<integer>18</integer>
<key>originalWidth</key>
<integer>14</integer>
<key>originalHeight</key>
<integer>18</integer>
<key>x</key>
<integer>408</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0001_图层-60769.png</key>
<dict>
<key>width</key>
<integer>13</integer>
<key>height</key>
<integer>18</integer>
<key>originalWidth</key>
<integer>13</integer>
<key>originalHeight</key>
<integer>18</integer>
<key>x</key>
<integer>424</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0000_图层-60768.png</key>
<dict>
<key>width</key>
<integer>14</integer>
<key>height</key>
<integer>18</integer>
<key>originalWidth</key>
<integer>14</integer>
<key>originalHeight</key>
<integer>18</integer>
<key>x</key>
<integer>439</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0006_图层-60776.png</key>
<dict>
<key>width</key>
<integer>22</integer>
<key>height</key>
<integer>29</integer>
<key>originalWidth</key>
<integer>22</integer>
<key>originalHeight</key>
<integer>29</integer>
<key>x</key>
<integer>455</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0009_图层-60774.png</key>
<dict>
<key>width</key>
<integer>44</integer>
<key>height</key>
<integer>27</integer>
<key>originalWidth</key>
<integer>44</integer>
<key>originalHeight</key>
<integer>27</integer>
<key>x</key>
<integer>479</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
<key>kapai_0010_图层-60775.png</key>
<dict>
<key>width</key>
<integer>143</integer>
<key>height</key>
<integer>162</integer>
<key>originalWidth</key>
<integer>143</integer>
<key>originalHeight</key>
<integer>162</integer>
<key>x</key>
<integer>525</integer>
<key>y</key>
<integer>0</integer>
<key>offsetX</key>
<real>0</real>
<key>offsetY</key>
<real>0</real>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>0</integer>
<key>textureFileName</key>
<ustring>10100.png</ustring>
<key>realTextureFileName</key>
<ustring>10100.png</ustring>
<key>size</key>
<string>{1024,1024}</string>
</dict>
<key>texture</key>
<dict>
<key>width</key>
<integer>1024</integer>
<key>height</key>
<integer>1024</integer>
</dict>
</dict>
</plist>
\ No newline at end of file
<GameFile>
<PropertyGroup Name="MAX" Type="Node" ID="a216914d-c0d7-49f6-8da3-6a19dd0dc55f" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="0.4000">
<Timeline ActionTag="73135095" Property="VisibleForFrame">
<BoolFrame FrameIndex="0" Tween="False" Value="True" />
</Timeline>
<Timeline ActionTag="73135095" Property="AnchorPoint">
<ScaleFrame FrameIndex="0" X="0.5000" Y="0.5000">
<EasingData Type="0" />
</ScaleFrame>
</Timeline>
<Timeline ActionTag="73135094" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
<Timeline ActionTag="73135094" Property="Scale">
<ScaleFrame FrameIndex="0" Tween="False" X="1.0000" Y="1.0000" />
</Timeline>
<Timeline ActionTag="73135094" Property="RotationSkew">
<ScaleFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
</Animation>
<ObjectData Name="MAX" ctype="GameNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="图层 1" ActionTag="73135094" IconVisible="False" ctype="SingleNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="SpriteObject" ActionTag="73135095" IconVisible="False" LeftMargin="-23.0000" RightMargin="-23.0000" TopMargin="-23.0000" BottomMargin="-23.0000" ctype="SpriteObjectData">
<Size X="44.0000" Y="27.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="bg/testAniam/kapai_0009_.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
\ No newline at end of file
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file
<GameFile>
<PropertyGroup Name="gongji" Type="Node" ID="a216914d-c0d7-49f6-8da3-6a19dd0dc55f" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="0.4000">
<Timeline ActionTag="792205267" Property="VisibleForFrame">
<BoolFrame FrameIndex="0" Tween="False" Value="True" />
</Timeline>
<Timeline ActionTag="792205267" Property="AnchorPoint">
<ScaleFrame FrameIndex="0" X="0.5000" Y="0.5000">
<EasingData Type="0" />
</ScaleFrame>
</Timeline>
<Timeline ActionTag="792205266" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
<Timeline ActionTag="792205266" Property="Scale">
<ScaleFrame FrameIndex="0" Tween="False" X="1.0000" Y="1.0000" />
</Timeline>
<Timeline ActionTag="792205266" Property="RotationSkew">
<ScaleFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
</Animation>
<ObjectData Name="攻击" ctype="GameNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="图层 1" ActionTag="792205266" IconVisible="False" ctype="SingleNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="SpriteObject" ActionTag="792205267" IconVisible="False" LeftMargin="-23.0000" RightMargin="-23.0000" TopMargin="-23.0000" BottomMargin="-23.0000" ctype="SpriteObjectData">
<Size X="31.0000" Y="32.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="bg/testAniam/kapai_0007_.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
\ No newline at end of file
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file
<GameFile>
<PropertyGroup Name="gongjishuzhi3" Type="Node" ID="a216914d-c0d7-49f6-8da3-6a19dd0dc55f" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="0.4000">
<Timeline ActionTag="-1523257670" Property="VisibleForFrame">
<BoolFrame FrameIndex="0" Tween="False" Value="True" />
</Timeline>
<Timeline ActionTag="-1523257670" Property="AnchorPoint">
<ScaleFrame FrameIndex="0" X="0.5000" Y="0.5000">
<EasingData Type="0" />
</ScaleFrame>
</Timeline>
<Timeline ActionTag="-1523257671" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
<Timeline ActionTag="-1523257671" Property="Scale">
<ScaleFrame FrameIndex="0" Tween="False" X="1.0000" Y="1.0000" />
</Timeline>
<Timeline ActionTag="-1523257671" Property="RotationSkew">
<ScaleFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
</Animation>
<ObjectData Name="攻击数值3" ctype="GameNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="图层 1" ActionTag="-1523257671" IconVisible="False" ctype="SingleNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="SpriteObject" ActionTag="-1523257670" IconVisible="False" LeftMargin="-23.0000" RightMargin="-23.0000" TopMargin="-23.0000" BottomMargin="-23.0000" ctype="SpriteObjectData">
<Size X="14.0000" Y="19.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="bg/testAniam/kapai_0004_.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
\ No newline at end of file
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file
<GameFile>
<PropertyGroup Name="hit_effect_1002_1" Type="Node" ID="a216914d-c0d7-49f6-8da3-6a19dd0dc55f" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="0.4000">
<Timeline ActionTag="1603856648" Property="VisibleForFrame">
<BoolFrame FrameIndex="0" Tween="False" Value="True" />
</Timeline>
<Timeline ActionTag="1603856648" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="0.0500" Y="-0.0500" />
</Timeline>
<Timeline ActionTag="1603856647" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="2.3500" Y="-2.3500" />
</Timeline>
<Timeline ActionTag="1603856647" Property="Scale">
<ScaleFrame FrameIndex="0" Tween="False" X="2.0000" Y="2.0000" />
</Timeline>
<Timeline ActionTag="1603856647" Property="RotationSkew">
<ScaleFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
<Timeline ActionTag="1603856647" Property="CColor">
<ColorFrame FrameIndex="0" Tween="False" Alpha="255">
<Color A="255" R="255" G="255" B="255" />
</ColorFrame>
</Timeline>
<Timeline ActionTag="1603856647" Property="Alpha">
<IntFrame FrameIndex="0" Value="255">
<EasingData Type="0" />
</IntFrame>
</Timeline>
</Animation>
<ObjectData Name="hit_effect_1002_1" ctype="GameNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="图层 1" ActionTag="1603856647" IconVisible="False" LeftMargin="2.3500" RightMargin="-2.3500" TopMargin="2.3500" BottomMargin="-2.3500" ctype="SingleNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="ProjectNodeObject" ActionTag="1603856648" IconVisible="False" LeftMargin="0.0500" RightMargin="-0.0500" TopMargin="0.0500" BottomMargin="-0.0500" StretchWidthEnable="False" StretchHeightEnable="False" InnerActionSpeed="0.0000" CustomSizeEnabled="False" ctype="ProjectNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="0.0500" Y="-0.0500" />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="bg/testAniam/yuanjian.csd" Plist="" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position X="2.3500" Y="-2.3500" />
<Scale ScaleX="2.0000" ScaleY="2.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
\ No newline at end of file
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file
<GameFile>
<PropertyGroup Name="hong3" Type="Node" ID="a216914d-c0d7-49f6-8da3-6a19dd0dc55f" Version="3.10.0.0" />
<Content ctype="GameProjectContent">
<Content>
<Animation Duration="0" Speed="0.4000">
<Timeline ActionTag="965816644" Property="VisibleForFrame">
<BoolFrame FrameIndex="0" Tween="False" Value="True" />
</Timeline>
<Timeline ActionTag="965816644" Property="AnchorPoint">
<ScaleFrame FrameIndex="0" X="0.5000" Y="0.5000">
<EasingData Type="0" />
</ScaleFrame>
</Timeline>
<Timeline ActionTag="965816643" Property="Position">
<PointFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
<Timeline ActionTag="965816643" Property="Scale">
<ScaleFrame FrameIndex="0" Tween="False" X="1.0000" Y="1.0000" />
</Timeline>
<Timeline ActionTag="965816643" Property="RotationSkew">
<ScaleFrame FrameIndex="0" Tween="False" X="0.0000" Y="0.0000" />
</Timeline>
</Animation>
<ObjectData Name="红3" ctype="GameNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="图层 1" ActionTag="965816643" IconVisible="False" ctype="SingleNodeObjectData">
<Size X="0.0000" Y="0.0000" />
<Children>
<AbstractNodeData Name="SpriteObject" ActionTag="965816644" IconVisible="False" LeftMargin="-23.0000" RightMargin="-23.0000" TopMargin="-23.0000" BottomMargin="-23.0000" ctype="SpriteObjectData">
<Size X="14.0000" Y="18.0000" />
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
<FileData Type="Normal" Path="bg/testAniam/kapai_0000_.png" Plist="" />
<BlendFunc Src="1" Dst="771" />
</AbstractNodeData>
</Children>
<AnchorPoint ScaleX="0.5000" ScaleY="0.5000" />
<Position />
<Scale ScaleX="1.0000" ScaleY="1.0000" />
<CColor A="255" R="255" G="255" B="255" />
<PrePosition />
<PreSize X="0.0000" Y="0.0000" />
</AbstractNodeData>
</Children>
</ObjectData>
</Content>
</Content>
</GameFile>
\ No newline at end of file
<UserData Version="3.10.0.0">
<Properties>
<Item Key="GuidesList">
<Value ctype="GuidesData" />
</Item>
</Properties>
</UserData>
\ No newline at end of file