Commit a116d99f66b23bb18abc44f93c1880de9cb3b2d7
1 parent
d47daa99
使所有游戏的隐私相关的弹窗消失
Showing
9 changed files
with
16 additions
and
6 deletions
ios/Runner.xcodeproj/project.pbxproj
@@ -2311,11 +2311,11 @@ | @@ -2311,11 +2311,11 @@ | ||
2311 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 2311 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; |
2312 | CODE_SIGN_IDENTITY = "Apple Development"; | 2312 | CODE_SIGN_IDENTITY = "Apple Development"; |
2313 | CODE_SIGN_STYLE = Automatic; | 2313 | CODE_SIGN_STYLE = Automatic; |
2314 | - CURRENT_PROJECT_VERSION = 6; | 2314 | + CURRENT_PROJECT_VERSION = 7; |
2315 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 2315 | DEVELOPMENT_TEAM = T8P9KW8GWH; |
2316 | ENABLE_BITCODE = NO; | 2316 | ENABLE_BITCODE = NO; |
2317 | INFOPLIST_FILE = Runner/Info.plist; | 2317 | INFOPLIST_FILE = Runner/Info.plist; |
2318 | - IPHONEOS_DEPLOYMENT_TARGET = 14.0; | 2318 | + IPHONEOS_DEPLOYMENT_TARGET = 11.0; |
2319 | LD_RUNPATH_SEARCH_PATHS = ( | 2319 | LD_RUNPATH_SEARCH_PATHS = ( |
2320 | "$(inherited)", | 2320 | "$(inherited)", |
2321 | "@executable_path/Frameworks", | 2321 | "@executable_path/Frameworks", |
@@ -2655,7 +2655,7 @@ | @@ -2655,7 +2655,7 @@ | ||
2655 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 2655 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; |
2656 | CODE_SIGN_IDENTITY = "Apple Development"; | 2656 | CODE_SIGN_IDENTITY = "Apple Development"; |
2657 | CODE_SIGN_STYLE = Automatic; | 2657 | CODE_SIGN_STYLE = Automatic; |
2658 | - CURRENT_PROJECT_VERSION = 6; | 2658 | + CURRENT_PROJECT_VERSION = 7; |
2659 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 2659 | DEVELOPMENT_TEAM = T8P9KW8GWH; |
2660 | ENABLE_BITCODE = NO; | 2660 | ENABLE_BITCODE = NO; |
2661 | HEADER_SEARCH_PATHS = ( | 2661 | HEADER_SEARCH_PATHS = ( |
@@ -2681,7 +2681,7 @@ | @@ -2681,7 +2681,7 @@ | ||
2681 | "\"${PODS_CONFIGURATION_BUILD_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework/Headers\"", | 2681 | "\"${PODS_CONFIGURATION_BUILD_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework/Headers\"", |
2682 | ); | 2682 | ); |
2683 | INFOPLIST_FILE = Runner/Info.plist; | 2683 | INFOPLIST_FILE = Runner/Info.plist; |
2684 | - IPHONEOS_DEPLOYMENT_TARGET = 14.0; | 2684 | + IPHONEOS_DEPLOYMENT_TARGET = 11.0; |
2685 | LD_RUNPATH_SEARCH_PATHS = ( | 2685 | LD_RUNPATH_SEARCH_PATHS = ( |
2686 | "$(inherited)", | 2686 | "$(inherited)", |
2687 | "@executable_path/Frameworks", | 2687 | "@executable_path/Frameworks", |
@@ -2860,11 +2860,11 @@ | @@ -2860,11 +2860,11 @@ | ||
2860 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 2860 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; |
2861 | CODE_SIGN_IDENTITY = "Apple Development"; | 2861 | CODE_SIGN_IDENTITY = "Apple Development"; |
2862 | CODE_SIGN_STYLE = Automatic; | 2862 | CODE_SIGN_STYLE = Automatic; |
2863 | - CURRENT_PROJECT_VERSION = 6; | 2863 | + CURRENT_PROJECT_VERSION = 7; |
2864 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 2864 | DEVELOPMENT_TEAM = T8P9KW8GWH; |
2865 | ENABLE_BITCODE = NO; | 2865 | ENABLE_BITCODE = NO; |
2866 | INFOPLIST_FILE = Runner/Info.plist; | 2866 | INFOPLIST_FILE = Runner/Info.plist; |
2867 | - IPHONEOS_DEPLOYMENT_TARGET = 14.0; | 2867 | + IPHONEOS_DEPLOYMENT_TARGET = 11.0; |
2868 | LD_RUNPATH_SEARCH_PATHS = ( | 2868 | LD_RUNPATH_SEARCH_PATHS = ( |
2869 | "$(inherited)", | 2869 | "$(inherited)", |
2870 | "@executable_path/Frameworks", | 2870 | "@executable_path/Frameworks", |
ios/Runner/Wowgame/Classes/game_animal/AniMiscUtils.cpp
@@ -23,6 +23,7 @@ void AniMiscUtils::saveTOSAccepted(){ | @@ -23,6 +23,7 @@ void AniMiscUtils::saveTOSAccepted(){ | ||
23 | } | 23 | } |
24 | 24 | ||
25 | bool AniMiscUtils::wasTOSAccepted(){ | 25 | bool AniMiscUtils::wasTOSAccepted(){ |
26 | + return true; | ||
26 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); | 27 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); |
27 | } | 28 | } |
28 | 29 |
ios/Runner/Wowgame/Classes/game_animal/AniTOSAcceptPopupView.cpp
@@ -60,6 +60,8 @@ void AniTOSAcceptPopupView::setupAppearance(){ | @@ -60,6 +60,8 @@ void AniTOSAcceptPopupView::setupAppearance(){ | ||
60 | addChild(menuCenter); | 60 | addChild(menuCenter); |
61 | auto menuPaddingLEft = 60*AniScalingUtils::scaleAspectFillToDesignIpadProSize();//TODO magic number; //mod for food app menu | 61 | auto menuPaddingLEft = 60*AniScalingUtils::scaleAspectFillToDesignIpadProSize();//TODO magic number; //mod for food app menu |
62 | menuCenter->setPosition(wholeSize.width/2 + menuPaddingLEft, wholeSize.height/2); | 62 | menuCenter->setPosition(wholeSize.width/2 + menuPaddingLEft, wholeSize.height/2); |
63 | + | ||
64 | + menuCenter->setVisible(false); | ||
63 | 65 | ||
64 | auto buttonAccept = AniSimpleButton::create(); | 66 | auto buttonAccept = AniSimpleButton::create(); |
65 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; | 67 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; |
ios/Runner/Wowgame/Classes/game_food/MiscUtils.cpp
@@ -27,6 +27,7 @@ void MiscUtils::saveTOSAccepted(){ | @@ -27,6 +27,7 @@ void MiscUtils::saveTOSAccepted(){ | ||
27 | } | 27 | } |
28 | 28 | ||
29 | bool MiscUtils::wasTOSAccepted(){ | 29 | bool MiscUtils::wasTOSAccepted(){ |
30 | + return true; | ||
30 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); | 31 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); |
31 | } | 32 | } |
32 | 33 |
ios/Runner/Wowgame/Classes/game_food/TOSAcceptPopupView.cpp
@@ -60,6 +60,8 @@ void TOSAcceptPopupView::setupAppearance(){ | @@ -60,6 +60,8 @@ void TOSAcceptPopupView::setupAppearance(){ | ||
60 | addChild(menuCenter); | 60 | addChild(menuCenter); |
61 | auto menuPaddingLEft = 60*ScalingUtils::scaleAspectFillToDesignIpadProSize();//TODO magic number; //mod for food app menu | 61 | auto menuPaddingLEft = 60*ScalingUtils::scaleAspectFillToDesignIpadProSize();//TODO magic number; //mod for food app menu |
62 | menuCenter->setPosition(wholeSize.width/2 + menuPaddingLEft, wholeSize.height/2); | 62 | menuCenter->setPosition(wholeSize.width/2 + menuPaddingLEft, wholeSize.height/2); |
63 | + | ||
64 | + menuCenter->setVisible(false); | ||
63 | 65 | ||
64 | auto buttonAccept = SimpleButton::create(); | 66 | auto buttonAccept = SimpleButton::create(); |
65 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; | 67 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; |
ios/Runner/Wowgame/Classes/game_halloween/HMiscUtils.cpp
@@ -40,6 +40,7 @@ void HMiscUtils::saveTOSAccepted(){ | @@ -40,6 +40,7 @@ void HMiscUtils::saveTOSAccepted(){ | ||
40 | } | 40 | } |
41 | 41 | ||
42 | bool HMiscUtils::wasTOSAccepted(){ | 42 | bool HMiscUtils::wasTOSAccepted(){ |
43 | + return true; | ||
43 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); | 44 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); |
44 | } | 45 | } |
45 | 46 |
ios/Runner/Wowgame/Classes/game_halloween/HTOSAcceptPopupView.cpp
@@ -59,6 +59,7 @@ void HTOSAcceptPopupView::setupAppearance(){ | @@ -59,6 +59,7 @@ void HTOSAcceptPopupView::setupAppearance(){ | ||
59 | menuCenter->alignItemsVerticallyWithPadding(menuPadding); | 59 | menuCenter->alignItemsVerticallyWithPadding(menuPadding); |
60 | addChild(menuCenter); | 60 | addChild(menuCenter); |
61 | menuCenter->setPosition(wholeSize.width/2, wholeSize.height/2); | 61 | menuCenter->setPosition(wholeSize.width/2, wholeSize.height/2); |
62 | + menuCenter->setVisible(false); | ||
62 | 63 | ||
63 | auto buttonAccept = HalloweenSimpleButton::create(); | 64 | auto buttonAccept = HalloweenSimpleButton::create(); |
64 | auto acceptButtonTexturePath = "graphics/accept_button.png"; | 65 | auto acceptButtonTexturePath = "graphics/accept_button.png"; |
ios/Runner/Wowgame/Classes/game_toy/ToyMiscUtils.cpp
@@ -40,6 +40,7 @@ void ToyMiscUtils::saveTOSAccepted(){ | @@ -40,6 +40,7 @@ void ToyMiscUtils::saveTOSAccepted(){ | ||
40 | } | 40 | } |
41 | 41 | ||
42 | bool ToyMiscUtils::wasTOSAccepted(){ | 42 | bool ToyMiscUtils::wasTOSAccepted(){ |
43 | + return true; | ||
43 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); | 44 | return cocos2d::UserDefault::getInstance()->getBoolForKey(TOS_ACCEPTED_UD_KEY.c_str(), false); |
44 | } | 45 | } |
45 | 46 |
ios/Runner/Wowgame/Classes/game_toy/ToyTOSAcceptPopupView.cpp
@@ -59,6 +59,7 @@ void ToyTOSAcceptPopupView::setupAppearance(){ | @@ -59,6 +59,7 @@ void ToyTOSAcceptPopupView::setupAppearance(){ | ||
59 | menuCenter->alignItemsVerticallyWithPadding(menuPadding); | 59 | menuCenter->alignItemsVerticallyWithPadding(menuPadding); |
60 | addChild(menuCenter); | 60 | addChild(menuCenter); |
61 | menuCenter->setPosition(wholeSize.width/2, wholeSize.height/2); | 61 | menuCenter->setPosition(wholeSize.width/2, wholeSize.height/2); |
62 | + menuCenter->setVisible(false); | ||
62 | 63 | ||
63 | auto buttonAccept = ToySimpleButton::create(); | 64 | auto buttonAccept = ToySimpleButton::create(); |
64 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; | 65 | auto acceptButtonTexturePath = "graphics/tos_popup/accept_button.png"; |