diff --git a/OpenSimulator.app/Contents/Info.plist b/OpenSimulator.app/Contents/Info.plist index 11979a4..b922a08 100644 --- a/OpenSimulator.app/Contents/Info.plist +++ b/OpenSimulator.app/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18A391 + 18G1012 CFBundleDevelopmentRegion en CFBundleExecutable @@ -31,17 +31,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 10A255 + 11B500 DTPlatformVersion GM DTSDKBuild - 18A384 + 19B89 DTSDKName - macosx10.14 + macosx10.15 DTXcode - 1000 + 1120 DTXcodeBuild - 10A255 + 11B500 LSMinimumSystemVersion 10.13 LSUIElement diff --git a/OpenSimulator.app/Contents/MacOS/OpenSimulator b/OpenSimulator.app/Contents/MacOS/OpenSimulator index f524a98..35ea105 100755 Binary files a/OpenSimulator.app/Contents/MacOS/OpenSimulator and b/OpenSimulator.app/Contents/MacOS/OpenSimulator differ diff --git a/OpenSimulator.app/Contents/Resources/Assets.car b/OpenSimulator.app/Contents/Resources/Assets.car index a0e15a0..916eeb7 100644 Binary files a/OpenSimulator.app/Contents/Resources/Assets.car and b/OpenSimulator.app/Contents/Resources/Assets.car differ diff --git a/OpenSimulator.app/Contents/_CodeSignature/CodeResources b/OpenSimulator.app/Contents/_CodeSignature/CodeResources index 009cc4c..1820f5f 100644 --- a/OpenSimulator.app/Contents/_CodeSignature/CodeResources +++ b/OpenSimulator.app/Contents/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ Resources/Assets.car - TI3/tmZ3tw9/fwmn4oSLdJ1aqqI= + JnbGBBKbPObW3Zu1nhcMiAROz6c= Resources/Base.lproj/MainMenu.nib @@ -30,7 +30,7 @@ hash2 - VHjOLtjdzQQ+rBHp+sR4xpR5ZETM0gSdtWSb2WdheYA= + LGX9WVSv2uDbBhSjMkQWkhfZiIYVvscMH0Cx2HZknfw= Resources/Base.lproj/MainMenu.nib diff --git a/OpenSimulator.xcodeproj/project.xcworkspace/xcuserdata/lizhi.xcuserdatad/UserInterfaceState.xcuserstate b/OpenSimulator.xcodeproj/project.xcworkspace/xcuserdata/lizhi.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..6a650a7 Binary files /dev/null and b/OpenSimulator.xcodeproj/project.xcworkspace/xcuserdata/lizhi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..d85a922 --- /dev/null +++ b/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcschemes/xcschememanagement.plist b/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..8bddc4e --- /dev/null +++ b/OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + OpenSimulator.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/OpenSimulator/AppDelegate.m b/OpenSimulator/AppDelegate.m index 89de411..14427f0 100644 --- a/OpenSimulator/AppDelegate.m +++ b/OpenSimulator/AppDelegate.m @@ -128,6 +128,23 @@ -(NSArray *)installedAppsOnSimulatorWithWindowName:(NSString *)windowName{ NSString * platform = [[NSString stringWithFormat:@"%@.%@",system,[windowName componentsSeparatedByString:@" "].lastObject] stringByReplacingOccurrencesOfString:@"." withString:@"-"]; NSString * versionKey = [NSString stringWithFormat:@"com.apple.CoreSimulator.SimRuntime.%@",platform]; NSDictionary * simDictionary = DefaultDevices[versionKey]; + if (simDictionary == nil) { + NSLog(@"Can't find %@", versionKey); + // 修正一下最小的子版本号有时候不在配置中的情况 + NSArray *platformParts = [platform componentsSeparatedByString:@"-"]; + NSMutableString *platform2 = [[NSMutableString alloc] initWithCapacity:platform.length]; + if (platformParts.count > 0) { + for (NSUInteger i=0; i