update StandaloneFileBrowser to use our org's fork

This commit is contained in:
minenice55 2024-01-27 16:37:13 -05:00
parent bd4147b966
commit 5b80f29f6f
13 changed files with 286 additions and 271 deletions

View file

@ -1,18 +1,17 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b8c465928f1784a3fac8dc3766f7201c guid: b8c465928f1784a3fac8dc3766f7201c
timeCreated: 1538230728
licenseType: Free
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: - first:
: Any '': Any
second: second:
enabled: 0 enabled: 0
settings: settings:
@ -78,7 +77,7 @@ PluginImporter:
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: x86_64
- first: - first:
Standalone: LinuxUniversal Standalone: LinuxUniversal
second: second:

View file

@ -1,130 +1,145 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e60958662eed5413d86143a0a69b731e guid: e60958662eed5413d86143a0a69b731e
timeCreated: 1491979494
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: data:
: Any first:
second: '': Any
enabled: 0 second:
settings: enabled: 0
Exclude Android: 1 settings:
Exclude Editor: 0 Exclude Android: 1
Exclude Linux: 1 Exclude Editor: 0
Exclude Linux64: 1 Exclude Linux: 1
Exclude LinuxUniversal: 1 Exclude Linux64: 1
Exclude OSXIntel: 1 Exclude LinuxUniversal: 1
Exclude OSXIntel64: 1 Exclude OSXIntel: 1
Exclude OSXUniversal: 1 Exclude OSXIntel64: 1
Exclude WebGL: 1 Exclude OSXUniversal: 1
Exclude Win: 0 Exclude WebGL: 1
Exclude Win64: 0 Exclude Win: 0
Exclude iOS: 1 Exclude Win64: 0
- first: Exclude iOS: 1
: Editor data:
second: first:
enabled: 0 '': Editor
settings: second:
CPU: AnyCPU enabled: 0
OS: AnyOS settings:
- first: CPU: AnyCPU
Android: Android OS: AnyOS
second: data:
enabled: 0 first:
settings: Android: Android
CPU: ARMv7 second:
- first: enabled: 0
Any: settings:
second: CPU: ARMv7
enabled: 0 data:
settings: {} first:
- first: Any:
Editor: Editor second:
second: enabled: 0
enabled: 1 settings: {}
settings: data:
DefaultValueInitialized: true first:
- first: Editor: Editor
Facebook: Win second:
second: enabled: 1
enabled: 0 settings:
settings: DefaultValueInitialized: true
CPU: AnyCPU data:
- first: first:
Facebook: Win64 Facebook: Win
second: second:
enabled: 0 enabled: 0
settings: settings:
CPU: AnyCPU CPU: AnyCPU
- first: data:
Standalone: Linux first:
second: Facebook: Win64
enabled: 0 second:
settings: enabled: 0
CPU: None settings:
- first: CPU: AnyCPU
Standalone: Linux64 data:
second: first:
enabled: 0 Standalone: Linux
settings: second:
CPU: None enabled: 0
- first: settings:
Standalone: LinuxUniversal CPU: None
second: data:
enabled: 0 first:
settings: Standalone: Linux64
CPU: None second:
- first: enabled: 0
Standalone: OSXIntel settings:
second: CPU: None
enabled: 0 data:
settings: first:
CPU: None Standalone: LinuxUniversal
- first: second:
Standalone: OSXIntel64 enabled: 0
second: settings:
enabled: 0 CPU: None
settings: data:
CPU: None first:
- first: Standalone: OSXIntel
Standalone: OSXUniversal second:
second: enabled: 0
enabled: 0 settings:
settings: CPU: None
CPU: None data:
- first: first:
Standalone: Win Standalone: OSXIntel64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: AnyCPU CPU: None
- first: data:
Standalone: Win64 first:
second: Standalone: OSXUniversal
enabled: 1 second:
settings: enabled: 0
CPU: AnyCPU settings:
- first: CPU: None
Windows Store Apps: WindowsStoreApps data:
second: first:
enabled: 0 Standalone: Win
settings: second:
CPU: AnyCPU enabled: 1
- first: settings:
iPhone: iOS CPU: AnyCPU
second: data:
enabled: 0 first:
settings: Standalone: Win64
CompileFlags: second:
FrameworkDependencies: enabled: 1
settings:
CPU: AnyCPU
data:
first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
data:
first:
iPhone: iOS
second:
enabled: 0
settings:
CompileFlags:
FrameworkDependencies:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BuildMachineOSBuild</key> <key>BuildMachineOSBuild</key>
<string>22D68</string> <string>21A559</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
@ -31,20 +31,20 @@
<key>DTCompiler</key> <key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string> <string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key> <key>DTPlatformBuild</key>
<string>14C18</string> <string>13A1030d</string>
<key>DTPlatformName</key> <key>DTPlatformName</key>
<string>macosx</string> <string>macosx</string>
<key>DTPlatformVersion</key> <key>DTPlatformVersion</key>
<string>13.1</string> <string>12.0</string>
<key>DTSDKBuild</key> <key>DTSDKBuild</key>
<string>22C55</string> <string>21A344</string>
<key>DTSDKName</key> <key>DTSDKName</key>
<string>macosx13.1</string> <string>macosx12.0</string>
<key>DTXcode</key> <key>DTXcode</key>
<string>1420</string> <string>1310</string>
<key>DTXcodeBuild</key> <key>DTXcodeBuild</key>
<string>14C18</string> <string>13A1030d</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>13.1</string> <string>12.0</string>
</dict> </dict>
</plist> </plist>

View file

@ -1,8 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ce685769797f44046afa3e567860c94c guid: ce685769797f44046afa3e567860c94c
timeCreated: 1505756861
licenseType: Pro
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -1,8 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ddf122e0e89124ce78aacfeecb3ec554 guid: ddf122e0e89124ce78aacfeecb3ec554
timeCreated: 1508179371
licenseType: Pro
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -1,14 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature.meta guid: e6cebbdcd59894d7a8bdee7372ecad5d
guid: 7c3db81ca6b7837489ddd39d07d8a941
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
========
guid: e329403cfc5867042884e77dd4796d34
NativeFormatImporter:
>>>>>>>> release_1:Assets/Resources/Sprites/Games/Lockstep/Animations/Bach.controller.meta
externalObjects: {} externalObjects: {}
mainObjectFileID: 9100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5905078a1ef7dab4fa302ee6555826c0 guid: c817908af99224e82a0f7ca523cfeeee
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View file

@ -48,10 +48,7 @@ var StandaloneFileBrowserWebGLPlugin = {
} }
document.body.appendChild(fileInput); document.body.appendChild(fileInput);
document.onmouseup = function() { fileInput.click();
fileInput.click();
document.onmouseup = null;
}
}, },
// Save file // Save file
@ -87,4 +84,4 @@ var StandaloneFileBrowserWebGLPlugin = {
} }
}; };
mergeInto(LibraryManager.library, StandaloneFileBrowserWebGLPlugin); mergeInto(LibraryManager.library, StandaloneFileBrowserWebGLPlugin);

View file

@ -5,14 +5,11 @@ PluginImporter:
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: - first:
: Any '': Any
second: second:
enabled: 0 enabled: 0
settings: settings:
@ -64,7 +61,7 @@ PluginImporter:
second: second:
enabled: 0 enabled: 0
settings: settings:
CPU: AnyCPU CPU: x86_64
- first: - first:
Standalone: LinuxUniversal Standalone: LinuxUniversal
second: second:

View file

@ -1,130 +1,145 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 7d459a96865cc4aaab657012c6dc4833 guid: 7d459a96865cc4aaab657012c6dc4833
timeCreated: 1491979494
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: data:
: Any first:
second: '': Any
enabled: 0 second:
settings: enabled: 0
Exclude Android: 1 settings:
Exclude Editor: 0 Exclude Android: 1
Exclude Linux: 1 Exclude Editor: 0
Exclude Linux64: 1 Exclude Linux: 1
Exclude LinuxUniversal: 1 Exclude Linux64: 1
Exclude OSXIntel: 1 Exclude LinuxUniversal: 1
Exclude OSXIntel64: 1 Exclude OSXIntel: 1
Exclude OSXUniversal: 1 Exclude OSXIntel64: 1
Exclude WebGL: 1 Exclude OSXUniversal: 1
Exclude Win: 0 Exclude WebGL: 1
Exclude Win64: 0 Exclude Win: 0
Exclude iOS: 1 Exclude Win64: 0
- first: Exclude iOS: 1
: Editor data:
second: first:
enabled: 0 '': Editor
settings: second:
CPU: AnyCPU enabled: 0
OS: AnyOS settings:
- first: CPU: AnyCPU
Android: Android OS: AnyOS
second: data:
enabled: 0 first:
settings: Android: Android
CPU: ARMv7 second:
- first: enabled: 0
Any: settings:
second: CPU: ARMv7
enabled: 0 data:
settings: {} first:
- first: Any:
Editor: Editor second:
second: enabled: 0
enabled: 1 settings: {}
settings: data:
DefaultValueInitialized: true first:
- first: Editor: Editor
Facebook: Win second:
second: enabled: 1
enabled: 0 settings:
settings: DefaultValueInitialized: true
CPU: AnyCPU data:
- first: first:
Facebook: Win64 Facebook: Win
second: second:
enabled: 0 enabled: 0
settings: settings:
CPU: AnyCPU CPU: AnyCPU
- first: data:
Standalone: Linux first:
second: Facebook: Win64
enabled: 0 second:
settings: enabled: 0
CPU: None settings:
- first: CPU: AnyCPU
Standalone: Linux64 data:
second: first:
enabled: 0 Standalone: Linux
settings: second:
CPU: None enabled: 0
- first: settings:
Standalone: LinuxUniversal CPU: None
second: data:
enabled: 0 first:
settings: Standalone: Linux64
CPU: None second:
- first: enabled: 0
Standalone: OSXIntel settings:
second: CPU: None
enabled: 0 data:
settings: first:
CPU: None Standalone: LinuxUniversal
- first: second:
Standalone: OSXIntel64 enabled: 0
second: settings:
enabled: 0 CPU: None
settings: data:
CPU: None first:
- first: Standalone: OSXIntel
Standalone: OSXUniversal second:
second: enabled: 0
enabled: 0 settings:
settings: CPU: None
CPU: None data:
- first: first:
Standalone: Win Standalone: OSXIntel64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: AnyCPU CPU: None
- first: data:
Standalone: Win64 first:
second: Standalone: OSXUniversal
enabled: 1 second:
settings: enabled: 0
CPU: AnyCPU settings:
- first: CPU: None
Windows Store Apps: WindowsStoreApps data:
second: first:
enabled: 0 Standalone: Win
settings: second:
CPU: AnyCPU enabled: 1
- first: settings:
iPhone: iOS CPU: AnyCPU
second: data:
enabled: 0 first:
settings: Standalone: Win64
CompileFlags: second:
FrameworkDependencies: enabled: 1
settings:
CPU: AnyCPU
data:
first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
data:
first:
iPhone: iOS
second:
enabled: 0
settings:
CompileFlags:
FrameworkDependencies:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant: