client_Hale
2018-09-28 9e750d9f9c45d87141e0fbcef31f27384d441753
Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository
2个文件已修改
18 ■■■■ 已修改文件
ChannelDiff/iOS/mrgameios/The2thWorldSDK/UniversalSDK.mm 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/iOS/spyxxjios/The2thWorldSDK/UniversalSDK.mm 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/iOS/mrgameios/The2thWorldSDK/UniversalSDK.mm
@@ -81,7 +81,7 @@
    // 发送初始化完成
    [_dict removeAllObjects];
    [_dict setObject:[NSNumber numberWithInt:S2U_SdkInitComplete] forKey:@"code"];
    [_dict setObject:@"sp" forKey:@"channelPlatform"];
    [_dict setObject:@"mr" forKey:@"channelPlatform"];
    [self SendMessageToUnity:_dict];
}
@@ -347,10 +347,15 @@
        }
        case U2S_FreePlatformPay:
        {
            NSString* _roleName = [_dict objectForKey:@"roleName"];
            _roleName = [_roleName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
            NSMutableString* _temp = [[NSMutableString alloc] initWithString:_roleName];
            _roleName = [_temp stringByReplacingOccurrencesOfString:@"\u0000" withString:@""];
            MRRoleInformation *_model = [MRRoleInformation getInstance];
            _model.productid = [_dict objectForKey:@"identifier"];
            _model.productid = [_dict objectForKey:@"cpInfo"];
            _model.roleid = [_dict objectForKey:@"roleID"];
            _model.rolename = [_dict objectForKey:@"roleName"];
            _model.rolename = _roleName;
            _model.gamecno = [_dict objectForKey:@"orderId"];
            _model.rolelevel = [_dict objectForKey:@"level"];
            _model.serverid = [_dict objectForKey:@"sid"];
@@ -370,6 +375,7 @@
                 NSMutableDictionary *_dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                                                        [NSNumber numberWithInt:S2U_FreePlatformPayFail],@"code",nil];
                                              [                         self SendMessageToUnity:_dict];
                 NSLog(@"PayFail: %@",msg);
             }];
        }
            break;
ChannelDiff/iOS/spyxxjios/The2thWorldSDK/UniversalSDK.mm
@@ -29,6 +29,7 @@
static int sBatteryLevel = -1;
static int sBatteryState = -1;
static NSThread * _thread;
static NSString* APP_ID;
-(void) Init
{
@@ -310,6 +311,7 @@
    switch([[_dict objectForKey:@"code"] intValue]){
        case U2S_Init:
            [self Init];
            APP_ID = [_dict objectForKey:@"appID"];
            break;
        case U2S_CopyContent:
            [UIPasteboard generalPasteboard].string = _dict[@"content"];
@@ -358,10 +360,10 @@
        }
        case U2S_FreePlatformPay:
        {
            [SPYOUCommonAPi IAPShareForObject:[_dict objectForKey:@"identifier"]
            [SPYOUCommonAPi IAPShareForObject:[_dict objectForKey:@"cpInfo"]
                                       Amount:[_dict objectForKey:@"mount"]
                                    ExtraInfo:[NSString stringWithFormat:@"{\"appid\":\"%@\",\"cpinfo\":\"%@\",\"cporderid\":\"%@\"}",
                                               @"spxjgame",
                                               APP_ID,
                                               [_dict objectForKey:@"cpInfo"],
                                               [_dict objectForKey:@"orderId"]]
                                        block:^(BOOL state, NSString *error) {