Commit f8575017559dfbb3cb510cb0b9032d4252a678f0

Authored by 赵康
Exists in master

Merge branch 'master' of http://123.59.74.8:81/document/gumptech-document.git

Showing 20 changed files Side-by-side Diff

1   -
  1 +**/xcuserdata/**/*.*
2 2 **/.DS_Store
... ... @@ -40,6 +40,9 @@ Xcode 4: Open your Info.plist then add a new row URL Types. Set the URL identifi
40 40 //启用vk的代码,需要填入vk appId,若不接入vk,可以忽略
41 41 //VKBridge *vkBridge = [[VKBridge alloc] initWithVKAppId:@"5029792"];
42 42 //[LetsGameAPI instance].vkBridge = vkBridge;
  43 +
  44 + //隐藏gumptech的logo
  45 + [LetsGameAPI hiddenLogo:YES];
43 46  
44 47 [[LetsGameAPI instance] showLoginView]; // 弹出登录页面
45 48  
ios/GameSDK.framework/Versions/A/GameSDK
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
... ... @@ -12,7 +12,9 @@ static BOOL isDisableFB = NO;
12 12  
13 13 static BOOL isEnableVK = NO;
14 14  
15   -static NSString *version = @"3.3.3";
  15 +static BOOL hiddenLogo = NO;
  16 +
  17 +static NSString *version = @"3.3.5";
16 18  
17 19 @interface LetsGameAPI : NSObject
18 20  
... ... @@ -34,6 +36,8 @@ static NSString *version = @"3.3.3";
34 36 +(void)disableFB:(BOOL)isDisable;
35 37 +(BOOL)isFBDisable;
36 38 +(BOOL)isVKEnable;
  39 ++(void)hiddenLogo:(BOOL)isHidden;
  40 ++(BOOL)isHiddenLogo;
37 41  
38 42 - (void)logout;
39 43  
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.pbxproj
... ... @@ -13,7 +13,7 @@
13 13 3309D97F1C4394C800534E33 /* VKSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3309D97E1C4394C800534E33 /* VKSdk.framework */; };
14 14 331262371C50B56800B1B435 /* VKBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 331262361C50B56800B1B435 /* VKBridge.framework */; };
15 15 335EB0691C51D67D003E6F44 /* GameSDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 335EB0681C51D67D003E6F44 /* GameSDKResources.bundle */; };
16   - 335EB0801C5203DA003E6F44 /* GameSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335EB07F1C5203DA003E6F44 /* GameSDK.framework */; };
  16 + 3396626D1C892BAC00022866 /* GameSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335EB07F1C5203DA003E6F44 /* GameSDK.framework */; };
17 17 3CD53D9D1B81F37900E1B01A /* VKSdkResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3CD53D9C1B81F37900E1B01A /* VKSdkResources.bundle */; };
18 18 9934F1B219303DC6005EF4AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9934F1B119303DC6005EF4AB /* Foundation.framework */; };
19 19 9934F1B619303DC6005EF4AB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9934F1B519303DC6005EF4AB /* UIKit.framework */; };
... ... @@ -59,6 +59,7 @@
59 59 isa = PBXFrameworksBuildPhase;
60 60 buildActionMask = 2147483647;
61 61 files = (
  62 + 3396626D1C892BAC00022866 /* GameSDK.framework in Frameworks */,
62 63 331262371C50B56800B1B435 /* VKBridge.framework in Frameworks */,
63 64 3309D9791C438A5E00534E33 /* libz.1.2.5.tbd in Frameworks */,
64 65 3309D8551C312F6500534E33 /* QuartzCore.framework in Frameworks */,
... ... @@ -67,7 +68,6 @@
67 68 997523301930A50F00F50D29 /* SystemConfiguration.framework in Frameworks */,
68 69 3309D97F1C4394C800534E33 /* VKSdk.framework in Frameworks */,
69 70 997523281930A42500F50D29 /* CFNetwork.framework in Frameworks */,
70   - 335EB0801C5203DA003E6F44 /* GameSDK.framework in Frameworks */,
71 71 9934F1B619303DC6005EF4AB /* UIKit.framework in Frameworks */,
72 72 9934F1B219303DC6005EF4AB /* Foundation.framework in Frameworks */,
73 73 );
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/gump.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/en.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "Password";
3 3 "quick_play" = "Play";
4 4 "login" = "Login";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "signup" = "Signup";
7 7 "bind" = "Bound to email";
8 8 "loading" = "Loading";
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/pt-PT.strings
... ... @@ -3,7 +3,7 @@
3 3 "quick_login" = "Jogar Agora";
4 4 "quick_play" = "Play";
5 5 "login" = "Login";
6   -"gump_login" = "Gumptech Login>>";
  6 +"gump_login" = "Login>>";
7 7 "signup" = "Registrar";
8 8 "bind" = "Vincular ao email";
9 9 "loading" = "Carregando";
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/ru.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "Пароль";
3 3 "quick_play" = "Play";
4 4 "login" = "Войти";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "signup" = "Зарегистрироваться";
7 7 "bind" = "Bound to email";
8 8 "loading" = "Загружаю...";
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/th.strings
... ... @@ -3,7 +3,7 @@
3 3 "quick_play" = "Play";
4 4 "quick_login" = "เริ่มเล่น";
5 5 "login" = "ล็อกอิน";
6   -"gump_login" = "Gumptech Login>>";
  6 +"gump_login" = "Login>>";
7 7 "signup" = "ลงทะเบียน";
8 8 "bind" = "ผูกอีเมลล์";
9 9 "loading" = "กำลังโหลด";
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/zh-Hans.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "密码";
3 3 "quick_login" = "一键进入";
4 4 "quick_play" = "Play";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "login" = "登陆";
7 7 "loginFacebook" = "登录Facebook";
8 8 "signup" = "注册";
ios/GameSDKDemo/letsgameDemo/GameSDKResources.bundle/zh-Hant.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "密碼";
3 3 "quick_login" = "一鍵進入";
4 4 "quick_play" = "Play";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "login" = "登陸";
7 7 "signup" = "註冊";
8 8 "bind" = "綁定郵箱";
ios/GameSDKDemo/letsgameDemo/LSGMainViewController.m
... ... @@ -16,6 +16,8 @@
16 16 @property (nonatomic, strong) UILabel *resultLabel;
17 17  
18 18 @property(nonatomic,strong) UIButton *vkActivityShareBtn;
  19 +
  20 +@property(nonatomic,copy) NSString *sessionKey;
19 21 @end
20 22  
21 23 @implementation LSGMainViewController
... ... @@ -79,8 +81,10 @@
79 81  
80 82  
81 83 - (void)onClickTest {
82   - [LetsGameAPI instance].appId = @"10022";
83   - [LetsGameAPI instance].appKey = @"93a27b0bd99bac3e68a440b48aa421ab";
  84 + NSLog(@"mainBundle:%@",[[LetsGameAPI instance] version]);
  85 + [LetsGameAPI instance].appId = @"10047";
  86 + [LetsGameAPI instance].appKey = @"eccd9f7dc92858b741132fda313130cf";
  87 + [LetsGameAPI hiddenLogo:YES];
84 88 // [LetsGameAPI disableFB:NO];
85 89 NSLog(@"sdk version:%@",[[LetsGameAPI instance] version]);
86 90 //启用vk登录
... ... @@ -88,6 +92,7 @@
88 92 // [LetsGameAPI instance].vkBridge = vkBridge;
89 93  
90 94 [LetsGameAPI instance].succBlock = ^(NSString *userId, NSString *sessionKey, LSGAccountType type) {
  95 + self.sessionKey = sessionKey;
91 96 self.resultLabel.text = [NSString stringWithFormat:@"login succ: userId = %@, sessionKey = %@, accountType = %ld", userId, sessionKey, type];
92 97 };
93 98 [LetsGameAPI instance].dismissBlock = ^() {
... ... @@ -109,12 +114,13 @@
109 114 [LetsGameAPI instance].appId = @"10022";
110 115 [LetsGameAPI instance].appKey = @"93a27b0bd99bac3e68a440b48aa421ab";
111 116 NSMutableDictionary *payInfo = [NSMutableDictionary dictionary];
112   - [payInfo setValue:@"5001" forKey:@"serverId"];
  117 + [payInfo setValue:@"100" forKey:@"serverId"];
113 118 [payInfo setValue:@"10010" forKey:@"roleId"];
114 119 [payInfo setValue:@"1000" forKey:@"channelId"];
115 120 [payInfo setValue:@"10" forKey:@"amount"];
116 121 [payInfo setValue:@"ios demo" forKey:@"extraInfo"];
117 122 [payInfo setValue:@"元宝" forKey:@"product"];
  123 + [payInfo setValue:self.sessionKey forKey:@"sessionKey"];
118 124 [[LetsGameAPI instance] pay:payInfo];
119 125 }
120 126  
ios/GameSDKResources.bundle/en.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "Password";
3 3 "quick_play" = "Play";
4 4 "login" = "Login";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "signup" = "Signup";
7 7 "bind" = "Bound to email";
8 8 "loading" = "Loading";
ios/GameSDKResources.bundle/pt-PT.strings
... ... @@ -3,7 +3,7 @@
3 3 "quick_login" = "Jogar Agora";
4 4 "quick_play" = "Play";
5 5 "login" = "Login";
6   -"gump_login" = "Gumptech Login>>";
  6 +"gump_login" = "Login>>";
7 7 "signup" = "Registrar";
8 8 "bind" = "Vincular ao email";
9 9 "loading" = "Carregando";
ios/GameSDKResources.bundle/ru.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "Пароль";
3 3 "quick_play" = "Play";
4 4 "login" = "Войти";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "signup" = "Зарегистрироваться";
7 7 "bind" = "Bound to email";
8 8 "loading" = "Загружаю...";
ios/GameSDKResources.bundle/th.strings
... ... @@ -3,7 +3,7 @@
3 3 "quick_play" = "Play";
4 4 "quick_login" = "เริ่มเล่น";
5 5 "login" = "ล็อกอิน";
6   -"gump_login" = "Gumptech Login>>";
  6 +"gump_login" = "Login>>";
7 7 "signup" = "ลงทะเบียน";
8 8 "bind" = "ผูกอีเมลล์";
9 9 "loading" = "กำลังโหลด";
ios/GameSDKResources.bundle/zh-Hans.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "密码";
3 3 "quick_login" = "一键进入";
4 4 "quick_play" = "Play";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "login" = "登陆";
7 7 "loginFacebook" = "登录Facebook";
8 8 "signup" = "注册";
ios/GameSDKResources.bundle/zh-Hant.strings
... ... @@ -2,7 +2,7 @@
2 2 "password_hint" = "密碼";
3 3 "quick_login" = "一鍵進入";
4 4 "quick_play" = "Play";
5   -"gump_login" = "Gumptech Login>>";
  5 +"gump_login" = "Login>>";
6 6 "login" = "登陸";
7 7 "signup" = "註冊";
8 8 "bind" = "綁定郵箱";