From 40436fdebbea6293dd95463114d42749b78a1032 Mon Sep 17 00:00:00 2001 From: Kyle Dodson Date: Fri, 28 Sep 2018 11:45:55 -0700 Subject: [PATCH 1/3] Updated Unity project and various tooling configurations --- .editorconfig | 135 ++++++ .gitattributes | 120 +++++ .gitignore | 458 +++++++++++++++++- .vscode/launch.json | 35 ++ .vscode/settings.json | 61 +++ Assets/Plugins.meta | 3 +- Assets/Plugins/iOS.meta | 3 +- Assets/Zapic.meta | 3 +- Assets/Zapic/Editor.meta | 3 +- .../Zapic/Editor/ZapicDependencies.xml.meta | 2 - .../Editor/ZapicPostProcessBuild.cs.meta | 3 +- Assets/Zapic/Examples.meta | 3 +- Assets/Zapic/Examples/MenuDemo.unity.meta | 3 +- Assets/Zapic/Examples/ZapicButton.cs.meta | 3 +- Assets/Zapic/Examples/ZapicButton.png.meta | 2 - Assets/Zapic/Examples/ZapicExample.cs.meta | 3 +- Assets/Zapic/IZapicInterface.cs.meta | 2 - Assets/Zapic/MiniJSON.cs.meta | 2 - Assets/Zapic/Zapic.cs.meta | 3 +- Assets/Zapic/ZapicAndroidInterface.cs.meta | 2 - Assets/Zapic/ZapicBehavior.cs.meta | 2 - Assets/Zapic/ZapicEditorInterface.cs.meta | 2 - Assets/Zapic/ZapicPages.cs.meta | 3 +- Assets/Zapic/ZapicPlayer.cs.meta | 3 +- Assets/Zapic/ZapiciOSInterface.cs.meta | 2 - CodeMaid.config | 75 +++ Packages/manifest.json | 39 +- ProjectSettings/ProjectSettings.asset | 22 +- ProjectSettings/ProjectVersion.txt | 2 +- 29 files changed, 928 insertions(+), 71 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 CodeMaid.config diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..713040f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,135 @@ +root = true + +[*] +indent_style = space +trim_trailing_whitespace = true + +##### .NET Framework/.NET Core Projects ##### + +[*.sln] +charset = utf-8-bom +indent_style = tab +insert_final_newline = true + +[*.{csproj,dcproj,vbproj}] +charset = utf-8-bom +indent_size = 2 +insert_final_newline = true + +[*.{cs,csx,vb,vbx}] +charset = utf-8-bom +indent_size = 4 +insert_final_newline = true +max_line_length = 120 + +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion +dotnet_style_require_accessibility_modifiers = always:warning +dotnet_style_readonly_field = true:warning +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_auto_properties = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion + +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_constructors = true:suggestion +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion + +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion +csharp_prefer_simple_default_expression = true:suggestion +csharp_prefer_braces = true:suggestion + +visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion + +dotnet_sort_system_directives_first = true + +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_between_query_expression_clauses = true + +csharp_indent_case_contents = true +csharp_indent_switch_labels = true +csharp_indent_labels = flush_left + +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_around_binary_operators = before_and_after +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false + +csharp_preserve_single_line_statements = false +csharp_preserve_single_line_blocks = true + +##### Documents ##### + +[*.{json,json5,xml}] +charset = utf-8 +indent_size = 2 + +[*.md] +charset = utf-8 +insert_final_newline = true + +[*.{yml}] +charset = utf-8 +indent_size = 2 +insert_final_newline = true + +##### Shell Scripts ##### + +[*.{bat,cmd}] +charset = utf-8 +end_of_line = crlf +indent_size = 2 +insert_final_newline = true + +[*.ps1] +charset = utf-8-bom +indent_size = 2 +insert_final_newline = true + +[*.sh] +charset = utf-8 +end_of_line = lf +indent_size = 2 +insert_final_newline = true + +##### Web Projects ##### + +[*.{css,html,js,jsx,less,sass,scss,svg,ts,tsx}] +charset = utf-8 +indent_size = 2 +insert_final_newline = true +max_line_length = 120 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..26f8bc7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,120 @@ +* text=auto +*.7z binary +*.ai binary +*.bat text eol=crlf +*.bmp binary +*.class binary +*.cmd text eol=crlf +*.coffee text +*.cs text diff=csharp +*.csproj text +*.css text diff=css +*.csv text +*.dll binary +*.doc diff=astextplain +*.dockerignore text +*.docx diff=astextplain +*.dot diff=astextplain +*.env text +*.eot binary +*.eps binary +*.exe binary +*.gif binary +*.gz binary +*.htm text diff=html +*.html text diff=html +*.ico binary +*.ini text +*.jar binary +*.java text diff=java +*.jpg binary +*.jpeg binary +*.js text +*.json text +*.jsp text +*.jsx text +*.less text +*.m4a binary +*.m4v binary +*.md text +*.meta text +*.mid binary +*.midi binary +*.mov binary +*.mp3 binary +*.mp4 binary +*.mpeg binary +*.mpg binary +*.ogg binary +*.otf binary +*.pbxproj binary -merge=union +*.pdf binary +*.php text diff=php +*.pl text diff=perl +*.pm text diff=perl +*.png binary +*.psd binary +*.ps1 text +*.pxd text +*.py text diff=python +*.py3 text diff=python +*.pyc binary +*.pyd binary +*.pyo binary +*.pyw text diff=python +*.pywz binary +*.pyx text +*.pyz binary +*.rar binary +*.rb text diff=ruby +*.rtf diff=astextplain +*.sass text +*.scss text +*.sh text eol=lf +*.sln text +*.so binary +*.sql text +*.styl text +*.svg text +*.svgz binary +*.tar binary +*.tif binary +*.tiff binary +*.ts text +*.tsv text +*.tsx text +*.ttf binary +*.txt text +*.war binary +*.wav binary +*.wbmp binary +*.webm binary +*.webp binary +*.woff binary +*.woff2 binary +*.xhtml text diff=html +*.xml text +*.xz binary +*.yaml text +*.yml text +*.zip binary +.editorconfig text +.eslintrc text +.gitattributes text +.gitconfig text +.gitignore text +.htaccess text +AUTHORS* text +CHANGELOG* text +CHANGES* text +CONTRIBUTING* text +COPYING* text +COPYRIGHT* text +Dockerfile text +INSTALL* text +LICENSE* text +Makefile text +makefile text +NEWS* text +README* text +TODO* text diff --git a/.gitignore b/.gitignore index 3544fee..1de8bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,102 @@ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/Assets/AssetStoreTools* +## Linux.gitignore +## https://github.com/github/gitignore +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +## macOS.gitignore +## https://github.com/github/gitignore + +# General .DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +## Windows.gitignore +## https://github.com/github/gitignore + +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +## MonoDevelop.gitignore +## https://github.com/github/gitignore + +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ + +## Unity.gitignore +## https://github.com/github/gitignore -# Visual Studio 2015 cache directory -/.vs/ +[Ll]ibrary/ +[Tt]emp/ +[Oo]bj/ +[Bb]uild/ +[Bb]uilds/ +Assets/AssetStoreTools* + +# Visual Studio cache directory +.vs/ # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ @@ -24,9 +112,11 @@ ExportedObj/ *.booproj *.svd *.pdb +*.opendb # Unity3D generated meta files *.pidb.meta +*.pdb.meta # Unity3D Generated File On Crash Reports sysinfo.txt @@ -35,20 +125,354 @@ sysinfo.txt *.apk *.unitypackage -\.DS_Store +## VisualStudio.gitignore +## https://github.com/github/gitignore + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ -Carthage/ +# MSBuild Binary and Structured Log +*.binlog -\.vscode/ +# NVidia Nsight GPU debugger configuration file +*.nvuser -unity\.log +# MFractors (Xamarin productivity tool) working folder +.mfractor/ -ICSharpCode\.SharpZipLib\.dll +# Local History for Visual Studio +.localhistory/ -UnityPacker\.exe +## VisualStudioCode.gitignore +## https://github.com/github/gitignore -Assets/Zapic/Plugins/Android/ZapicManifest\.plugin/AndroidManifest\.xml +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json -Assets/Zapic/Plugins/Android/ZapicManifest\.plugin/AndroidManifest\.xml\.meta +## Zapic-SDK-Unity -Scripts/zapic-ios/ +# Keep Unity meta files +!/Assets/**/*.meta diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..4121d12 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Unity Editor", + "type": "unity", + "request": "launch" + }, + { + "name": "Windows Player", + "type": "unity", + "request": "launch" + }, + { + "name": "OSX Player", + "type": "unity", + "request": "launch" + }, + { + "name": "Linux Player", + "type": "unity", + "request": "launch" + }, + { + "name": "iOS Player", + "type": "unity", + "request": "launch" + }, + { + "name": "Android Player", + "type": "unity", + "request": "launch" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c169b2c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,61 @@ +{ + "editor.formatOnSave": true, + "editor.minimap.showSlider": "always", + "editor.renderWhitespace": "all", + "editor.rulers": [ + 120 + ], + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.gitignore": true, + "**/.gitmodules": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "ProjectSettings/": true, + "temp/": true, + "Temp/": true + } +} diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta index 6270fb9..efcfac5 100644 --- a/Assets/Plugins.meta +++ b/Assets/Plugins.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 606f231f0cbb54ab7853c818b6e345c3 folderAsset: yes -timeCreated: 1499975660 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS.meta b/Assets/Plugins/iOS.meta index 93d7f73..a683810 100644 --- a/Assets/Plugins/iOS.meta +++ b/Assets/Plugins/iOS.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 506768d1943294e739a974caea2bd5f7 folderAsset: yes -timeCreated: 1499975660 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Zapic.meta b/Assets/Zapic.meta index 7e8fcf9..6643e29 100644 --- a/Assets/Zapic.meta +++ b/Assets/Zapic.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 57c97fd9ddf314f3e8a01daef17136f6 folderAsset: yes -timeCreated: 1499959067 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Zapic/Editor.meta b/Assets/Zapic/Editor.meta index 3f7434e..a8d825f 100644 --- a/Assets/Zapic/Editor.meta +++ b/Assets/Zapic/Editor.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 47d1333ed4d37440183abb0ce4e27708 folderAsset: yes -timeCreated: 1508167056 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Zapic/Editor/ZapicDependencies.xml.meta b/Assets/Zapic/Editor/ZapicDependencies.xml.meta index 77b547c..da83c4f 100644 --- a/Assets/Zapic/Editor/ZapicDependencies.xml.meta +++ b/Assets/Zapic/Editor/ZapicDependencies.xml.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: bbf413162b31d6245a03de79bdca5453 -timeCreated: 1521932374 -licenseType: Free TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Zapic/Editor/ZapicPostProcessBuild.cs.meta b/Assets/Zapic/Editor/ZapicPostProcessBuild.cs.meta index 210a08e..ad24fa1 100644 --- a/Assets/Zapic/Editor/ZapicPostProcessBuild.cs.meta +++ b/Assets/Zapic/Editor/ZapicPostProcessBuild.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 05ed7c0e6b34f45eda08039368ae8c87 -timeCreated: 1508167068 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/Examples.meta b/Assets/Zapic/Examples.meta index 8cb8a85..e38f40c 100644 --- a/Assets/Zapic/Examples.meta +++ b/Assets/Zapic/Examples.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: aa7f4e0a1166b48ca862f6c40eef7894 folderAsset: yes -timeCreated: 1497548828 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Zapic/Examples/MenuDemo.unity.meta b/Assets/Zapic/Examples/MenuDemo.unity.meta index e56279f..537d0b6 100644 --- a/Assets/Zapic/Examples/MenuDemo.unity.meta +++ b/Assets/Zapic/Examples/MenuDemo.unity.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: f3ced3faf0ca343d08cc238f50cdf410 -timeCreated: 1497552965 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Zapic/Examples/ZapicButton.cs.meta b/Assets/Zapic/Examples/ZapicButton.cs.meta index 5d80f38..9a44dc7 100644 --- a/Assets/Zapic/Examples/ZapicButton.cs.meta +++ b/Assets/Zapic/Examples/ZapicButton.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 382a4d83b8cf741c1bcd5164ca5e6f12 -timeCreated: 1508309559 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/Examples/ZapicButton.png.meta b/Assets/Zapic/Examples/ZapicButton.png.meta index 88b7ee5..96e9a69 100644 --- a/Assets/Zapic/Examples/ZapicButton.png.meta +++ b/Assets/Zapic/Examples/ZapicButton.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 60ed6c1c3e25f4ccbb09e4aaf9f229df -timeCreated: 1497583318 -licenseType: Free TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/Zapic/Examples/ZapicExample.cs.meta b/Assets/Zapic/Examples/ZapicExample.cs.meta index 1e772e2..459eb82 100644 --- a/Assets/Zapic/Examples/ZapicExample.cs.meta +++ b/Assets/Zapic/Examples/ZapicExample.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 3c0cf682d2b5f4a29825373cf765ec42 -timeCreated: 1499978681 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/IZapicInterface.cs.meta b/Assets/Zapic/IZapicInterface.cs.meta index ae875ff..c1bbbf8 100644 --- a/Assets/Zapic/IZapicInterface.cs.meta +++ b/Assets/Zapic/IZapicInterface.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 99a4add867b664591b9fbd388468e405 -timeCreated: 1518632478 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Zapic/MiniJSON.cs.meta b/Assets/Zapic/MiniJSON.cs.meta index 97cdf3b..37e3b73 100644 --- a/Assets/Zapic/MiniJSON.cs.meta +++ b/Assets/Zapic/MiniJSON.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 64195a9a2c80c4442bca8d3d1107db20 -timeCreated: 1517524241 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Zapic/Zapic.cs.meta b/Assets/Zapic/Zapic.cs.meta index dce05ce..c2f62a7 100644 --- a/Assets/Zapic/Zapic.cs.meta +++ b/Assets/Zapic/Zapic.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 12e044cc9622546c8ad47375bbe4c636 -timeCreated: 1497549261 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/ZapicAndroidInterface.cs.meta b/Assets/Zapic/ZapicAndroidInterface.cs.meta index 6822706..830f9be 100644 --- a/Assets/Zapic/ZapicAndroidInterface.cs.meta +++ b/Assets/Zapic/ZapicAndroidInterface.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 4b530f454ec88a34b9cde3857fd23e1a -timeCreated: 1518560456 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Zapic/ZapicBehavior.cs.meta b/Assets/Zapic/ZapicBehavior.cs.meta index 9920579..9eceb03 100644 --- a/Assets/Zapic/ZapicBehavior.cs.meta +++ b/Assets/Zapic/ZapicBehavior.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 92d40c42d9d3249afad007a6117cd280 -timeCreated: 1528953462 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Zapic/ZapicEditorInterface.cs.meta b/Assets/Zapic/ZapicEditorInterface.cs.meta index c2034ad..70a1683 100644 --- a/Assets/Zapic/ZapicEditorInterface.cs.meta +++ b/Assets/Zapic/ZapicEditorInterface.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: ea07350bdd52c4c67bf4762e292c130a -timeCreated: 1518632478 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Zapic/ZapicPages.cs.meta b/Assets/Zapic/ZapicPages.cs.meta index 6a0ba4e..0b4787d 100644 --- a/Assets/Zapic/ZapicPages.cs.meta +++ b/Assets/Zapic/ZapicPages.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 0c4f8f5dc12ca41069eacdd1e80a4a25 -timeCreated: 1497552065 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/ZapicPlayer.cs.meta b/Assets/Zapic/ZapicPlayer.cs.meta index 86922dd..e433cd6 100644 --- a/Assets/Zapic/ZapicPlayer.cs.meta +++ b/Assets/Zapic/ZapicPlayer.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 32592455d40bf469ab0307edf2ee1e97 -timeCreated: 1524270061 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/Zapic/ZapiciOSInterface.cs.meta b/Assets/Zapic/ZapiciOSInterface.cs.meta index 1f53bdf..3df3b17 100644 --- a/Assets/Zapic/ZapiciOSInterface.cs.meta +++ b/Assets/Zapic/ZapiciOSInterface.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 898a2947a91214e9987b94c28dcc4345 -timeCreated: 1518632478 -licenseType: Free MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/CodeMaid.config b/CodeMaid.config new file mode 100644 index 0000000..a7ea0d5 --- /dev/null +++ b/CodeMaid.config @@ -0,0 +1,75 @@ + + + + +
+ + + + + + True + + + True + + + True + + + True + + + True + + + False + + + 2 + + + True + + + True + + + False + + + 120 + + + False + + + True + + + False + + + False + + + False + + + False + + + 4 + + + True + + + True + + + True + + + + diff --git a/Packages/manifest.json b/Packages/manifest.json index 526aca6..1342d0a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,4 +1,39 @@ { - "dependencies": { - } + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "2.0.16", + "com.unity.package-manager-ui": "1.9.11", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.2.4", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 70434b6..28f1d54 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 iosAllowHTTPDownload: 1 @@ -111,6 +110,8 @@ PlayerSettings: videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + vulkanEnableSetSRGBWrite: 0 + vulkanUseSWCommandBuffers: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -124,6 +125,7 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -138,10 +140,10 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 - enable360StereoCapture: 0 oculus: sharedDepthBuffer: 0 dashSupport: 0 + enable360StereoCapture: 0 protectGraphicsMemory: 0 useHDRDisplay: 0 m_ColorGamuts: 00000000 @@ -236,6 +238,7 @@ PlayerSettings: appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 appleEnableProMotion: 0 + vulkanEditorSupport: 0 clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: @@ -244,6 +247,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 @@ -275,6 +279,7 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -397,6 +402,9 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -559,7 +567,6 @@ PlayerSettings: metroApplicationDescription: Zapic-SDK-Unity wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -575,14 +582,6 @@ PlayerSettings: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 @@ -603,6 +602,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 22977b3..9069a39 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.0f2 +m_EditorVersion: 2018.2.10f1 From a0380c796d87986e0a2ebcd12d3f70698999faf0 Mon Sep 17 00:00:00 2001 From: Kyle Dodson Date: Tue, 2 Oct 2018 14:05:41 -0700 Subject: [PATCH 2/3] Added TPL-based interface methods, fixed model issues, and added docs --- Assets/Zapic/Examples/ZapicButton.cs | 15 +- Assets/Zapic/Examples/ZapicExample.cs | 128 ++-- Assets/Zapic/IZapicInterface.cs | 101 ++- Assets/Zapic/Zapic.cs | 312 +++++++-- Assets/Zapic/ZapicChallenge.cs | 264 ++++++-- Assets/Zapic/ZapicChallengeStatus.cs | 15 +- Assets/Zapic/ZapicCompetition.cs | 289 ++++++-- Assets/Zapic/ZapicCompetitionStatus.cs | 18 +- Assets/Zapic/ZapicEditorInterface.cs | 429 +++++++++--- Assets/Zapic/ZapicError.cs | 14 - Assets/Zapic/ZapicErrorCode.cs | 39 ++ Assets/Zapic/ZapicErrorCode.cs.meta | 11 + Assets/Zapic/ZapicException.cs | 47 ++ ...icError.cs.meta => ZapicException.cs.meta} | 0 Assets/Zapic/ZapicPage.cs | 30 + Assets/Zapic/ZapicPage.cs.meta | 11 + Assets/Zapic/ZapicPages.cs | 33 +- Assets/Zapic/ZapicPlayType.cs | 5 - Assets/Zapic/ZapicPlayer.cs | 109 ++- Assets/Zapic/ZapicStatistic.cs | 130 +++- Assets/Zapic/ZapiciOSInterface.cs | 632 +++++++++++------- 21 files changed, 1865 insertions(+), 767 deletions(-) delete mode 100644 Assets/Zapic/ZapicError.cs create mode 100644 Assets/Zapic/ZapicErrorCode.cs create mode 100644 Assets/Zapic/ZapicErrorCode.cs.meta create mode 100644 Assets/Zapic/ZapicException.cs rename Assets/Zapic/{ZapicError.cs.meta => ZapicException.cs.meta} (100%) create mode 100644 Assets/Zapic/ZapicPage.cs create mode 100644 Assets/Zapic/ZapicPage.cs.meta delete mode 100644 Assets/Zapic/ZapicPlayType.cs diff --git a/Assets/Zapic/Examples/ZapicButton.cs b/Assets/Zapic/Examples/ZapicButton.cs index facaa3a..0d899e0 100644 --- a/Assets/Zapic/Examples/ZapicButton.cs +++ b/Assets/Zapic/Examples/ZapicButton.cs @@ -1,14 +1,11 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; public class ZapicButton : MonoBehaviour { private void Awake() { - var button = this.GetComponent