Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 401b0fe1 401b0fe1468cd5cd5ac743d9ab54bd334db9c35e by jinwawa
Options

morning 0531

1 parent b2086fc7
Inline Side-by-side
Showing 4 changed files with 38 additions and 16 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!--m0800279afc6c--> 3 <!--m0800279afc6c-->
4 <!--m0800278b87c2--> 4 <!--m0800278b87c2-->
5 <!----> 5 <!---->
6 <Account>m0800278b87c4</Account> 6 <Account>m0800278b87c7</Account>
7 <exp>0</exp> 7 <exp>0</exp>
8 <versionnum>201801291657</versionnum> 8 <versionnum>201801291657</versionnum>
9 <isMusic>0</isMusic> 9 <isMusic>0</isMusic>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
29 <uid>1000100010142874</uid> 29 <uid>1030100010142918</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
...@@ -992,6 +992,11 @@ function UserModel.getAchievementNum() ...@@ -992,6 +992,11 @@ function UserModel.getAchievementNum()
992 num = num + 1; 992 num = num + 1;
993 end 993 end
994 end 994 end
995
996 local left_vip_day = UserModel.getLeftVipDay();
997 if v.type_id==10 and left_vip_day <= 0 and num>0 then --不是会员，不显示小红点
998 num=num-1 ;
999 end
995 end 1000 end
996 end 1001 end
997 return num; 1002 return num;
...@@ -1018,6 +1023,11 @@ function UserModel.hasAchivementReward() ...@@ -1018,6 +1023,11 @@ function UserModel.hasAchivementReward()
1018 end 1023 end
1019 end 1024 end
1020 end 1025 end
1026
1027 local left_vip_day = UserModel.getLeftVipDay();
1028 if achievement_data.type_id==10 and left_vip_day <= 0 then --不是会员，不显示小红点
1029 b=false ;
1030 end
1021 end 1031 end
1022 return b; 1032 return b;
1023 end 1033 end
......
...@@ -153,24 +153,36 @@ function AchievementView:updateItems() ...@@ -153,24 +153,36 @@ function AchievementView:updateItems()
153 btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetRewardClick)) end); 153 btn:addTouchEventListener( function(ref, type) self:onButtonClick(ref, type, handler(self, self.onGetRewardClick)) end);
154 print("load achievement icon:", i .. "_" .. ii .. ".png"); 154 print("load achievement icon:", i .. "_" .. ii .. ".png");
155 if achievement_data and achievement_data.data >= vv.data then 155 if achievement_data and achievement_data.data >= vv.data then
156 local icon_url = "res/ui/achievement/" .. i .. "_" .. ii .. ".png"; 156 local icon_url="";
157 local left_vip_day = UserModel.getLeftVipDay();
158 if info.id==10 and left_vip_day <= 0 then --不是会员，不显示金色框框
159 icon_url = "res/ui/achievement/gray_" .. i .. "_" .. ii .. ".png";
160 else
161 icon_url = "res/ui/achievement/" .. i .. "_" .. ii .. ".png";
162 end
157 if cc.FileUtils:getInstance():isFileExist(icon_url) then 163 if cc.FileUtils:getInstance():isFileExist(icon_url) then
158 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame()); 164 item:getChildByName("icon"):setSpriteFrame(cc.Sprite:create(icon_url):getSpriteFrame());
159 end 165 end
160 if not TableUtil.IsInTable(achievement_data.get_reward_id, ii) then 166 if not TableUtil.IsInTable(achievement_data.get_reward_id, ii) then
161 local left_vip_day = UserModel.getLeftVipDay(); 167 if info.id==10 and left_vip_day <= 0 then --不是会员，不显示领取成就的按钮
162 if info.id==10 and left_vip_day <= 0 then --不是会员，不能领取这个成就
163 item:getChildByName("btn_get"):setVisible(false); 168 item:getChildByName("btn_get"):setVisible(false);
169 local cur_val = 0;
170 local total_val = vv.data;
171 if achievement_data then
172 cur_val = achievement_data.data;
173 end
174 item:getChildByName("txt_progress"):setString(cur_val .. "/" .. total_val);
164 else 175 else
165 item:getChildByName("btn_get"):setVisible(true); 176 item:getChildByName("btn_get"):setVisible(true);
177 item:getChildByName("txt_des"):setVisible(false);
178 item:getChildByName("txt_progress"):setVisible(false);
179 item:getChildByName("bg_achievement_progress"):setVisible(false);
180 item:getChildByName("LoadingBar"):setVisible(false);
166 end 181 end
167 182
183 --
168 item:getChildByName("yilingqu"):setVisible(false); 184 item:getChildByName("yilingqu"):setVisible(false);
169 185
170 item:getChildByName("txt_des"):setVisible(false);
171 item:getChildByName("txt_progress"):setVisible(false);
172 item:getChildByName("LoadingBar"):setVisible(false);
173 item:getChildByName("bg_achievement_progress"):setVisible(false);
174 else 186 else
175 item:getChildByName("yilingqu"):setVisible(true); 187 item:getChildByName("yilingqu"):setVisible(true);
176 item:getChildByName("txt_des"):setVisible(false); 188 item:getChildByName("txt_des"):setVisible(false);
...@@ -188,14 +200,14 @@ function AchievementView:updateItems() ...@@ -188,14 +200,14 @@ function AchievementView:updateItems()
188 200
189 local per = math.floor(cur_val / total_val * 100); 201 local per = math.floor(cur_val / total_val * 100);
190 202
191 local left_vip_day = UserModel.getLeftVipDay(); 203 --local left_vip_day = UserModel.getLeftVipDay();
192 if info.id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条 204 --if info.id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条
193 item:getChildByName("LoadingBar"):setVisible(false); 205 --item:getChildByName("LoadingBar"):setVisible(false);
194 item:getChildByName("txt_progress"):setString("0/" .. total_val); 206 --item:getChildByName("txt_progress"):setString("0/" .. total_val);
195 else 207 --else
196 item:getChildByName("LoadingBar"):setPercent(per); 208 item:getChildByName("LoadingBar"):setPercent(per);
197 item:getChildByName("txt_progress"):setString(cur_val .. "/" .. total_val); 209 item:getChildByName("txt_progress"):setString(cur_val .. "/" .. total_val);
198 end 210 --end
199 211
200 item:getChildByName("yilingqu"):setVisible(false); 212 item:getChildByName("yilingqu"):setVisible(false);
201 item:getChildByName("btn_get"):setVisible(false); 213 item:getChildByName("btn_get"):setVisible(false);
...@@ -238,7 +250,7 @@ function AchievementView:onGetRewardClick(ref, type) ...@@ -238,7 +250,7 @@ function AchievementView:onGetRewardClick(ref, type)
238 if achievement_data and achievement_data.data >= ref.step_info.data and not TableUtil.IsInTable(achievement_data.get_reward_id, ref.step_id) then 250 if achievement_data and achievement_data.data >= ref.step_info.data and not TableUtil.IsInTable(achievement_data.get_reward_id, ref.step_id) then
239 251
240 local left_vip_day = UserModel.getLeftVipDay(); 252 local left_vip_day = UserModel.getLeftVipDay();
241 if ref.main_id==10 and left_vip_day <= 0 then --不是会员，不能显示这个进度条 253 if ref.main_id==10 and left_vip_day <= 0 then --不是会员，不能点击领取按钮
242 return ; 254 return ;
243 end 255 end
244 256
......