+ {{^_disableToc}} + {{>partials/toc}} +
+ {{/_disableToc}} + {{#_disableToc}} +
+ {{/_disableToc}} + {{#_disableAffix}} +
+ {{/_disableAffix}} + {{^_disableAffix}} +
+ {{/_disableAffix}} +
+ {{!body}} +
+ + +
+
+ {{^_disableAffix}} + {{>partials/affix}} + {{/_disableAffix}} +
+
+ {{^_disableFooter}} + {{>partials/footer}} + {{/_disableFooter}} +
+ {{>partials/scripts}} + + \ No newline at end of file diff --git a/Documentation/templates/unity_disqus/partials/affix.tmpl.partial b/Documentation/templates/unity_disqus/partials/affix.tmpl.partial new file mode 100644 index 0000000..1c9041b --- /dev/null +++ b/Documentation/templates/unity_disqus/partials/affix.tmpl.partial @@ -0,0 +1,28 @@ +{{!Copyright (c) Marvin Neurath. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}} + + \ No newline at end of file diff --git a/Documentation/templates/unity_disqus/partials/head.tmpl.partial b/Documentation/templates/unity_disqus/partials/head.tmpl.partial new file mode 100644 index 0000000..386d7ac --- /dev/null +++ b/Documentation/templates/unity_disqus/partials/head.tmpl.partial @@ -0,0 +1,21 @@ +{{!Copyright (c) Marvin Neurath. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}} + + + + + {{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}} + + + + {{#_description}}{{/_description}} + + + + + + + + {{#_noindex}}{{/_noindex}} + {{#_enableSearch}}{{/_enableSearch}} + {{#_enableNewTab}}{{/_enableNewTab}} + \ No newline at end of file diff --git a/Documentation/templates/unity_disqus/styles/docfx.js b/Documentation/templates/unity_disqus/styles/docfx.js new file mode 100644 index 0000000..702e044 --- /dev/null +++ b/Documentation/templates/unity_disqus/styles/docfx.js @@ -0,0 +1,1139 @@ +// Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information. +$(function () { + var active = 'active'; + var expanded = 'in'; + var collapsed = 'collapsed'; + var filtered = 'filtered'; + var show = 'show'; + var hide = 'hide'; + var util = new utility(); + + workAroundFixedHeaderForAnchors(); + highlight(); + enableSearch(); + + renderTables(); + renderAlerts(); + renderLinks(); + renderNavbar(); + renderSidebar(); + renderAffix(); + renderFooter(); + renderLogo(); + + breakText(); + renderTabs(); + + window.refresh = function (article) { + // Update markup result + if (typeof article == 'undefined' || typeof article.content == 'undefined') + console.error("Null Argument"); + $("article.content").html(article.content); + + highlight(); + renderTables(); + renderAlerts(); + renderAffix(); + renderTabs(); + } + + // Add this event listener when needed + // window.addEventListener('content-update', contentUpdate); + + function breakText() { + $(".xref").addClass("text-break"); + var texts = $(".text-break"); + texts.each(function () { + $(this).breakWord(); + }); + } + + // Styling for tables in conceptual documents using Bootstrap. + // See http://getbootstrap.com/css/#tables + function renderTables() { + $('table').addClass('table table-bordered table-striped table-condensed').wrap('
'); + } + + // Styling for alerts. + function renderAlerts() { + $('.TIP').addClass('alert alert-tip'); + $('.NOTE').addClass('alert alert-info'); + $('.WARNING').addClass('alert alert-warning'); + $('.IMPORTANT, .CAUTION').addClass('alert alert-danger'); + } + + // Enable anchors for headings. + (function () { + anchors.options = { + placement: 'left', + visible: 'touch' + }; + anchors.add('article h2:not(.no-anchor), article h3:not(.no-anchor), article h4:not(.no-anchor)'); + })(); + + // Open links to different host in a new window. + function renderLinks() { + if ($("meta[property='docfx:newtab']").attr("content") === "true") { + $(document.links).filter(function () { + return this.hostname !== window.location.hostname; + }).attr('target', '_blank'); + } + } + + // Enable highlight.js + function highlight() { + $('pre code').each(function (i, block) { + hljs.highlightBlock(block); + }); + $('pre code[highlight-lines]').each(function (i, block) { + if (block.innerHTML === "") return; + var lines = block.innerHTML.split('\n'); + + queryString = block.getAttribute('highlight-lines'); + if (!queryString) return; + + var ranges = queryString.split(','); + for (var j = 0, range; range = ranges[j++];) { + var found = range.match(/^(\d+)\-(\d+)?$/); + if (found) { + // consider region as `{startlinenumber}-{endlinenumber}`, in which {endlinenumber} is optional + var start = +found[1]; + var end = +found[2]; + if (isNaN(end) || end > lines.length) { + end = lines.length; + } + } else { + // consider region as a sigine line number + if (isNaN(range)) continue; + var start = +range; + var end = start; + } + if (start <= 0 || end <= 0 || start > end || start > lines.length) { + // skip current region if invalid + continue; + } + lines[start - 1] = '' + lines[start - 1]; + lines[end - 1] = lines[end - 1] + ''; + } + + block.innerHTML = lines.join('\n'); + }); + } + + // Support full-text-search + function enableSearch() { + var query; + var relHref = $("meta[property='docfx\\:rel']").attr("content"); + if (typeof relHref === 'undefined') { + return; + } + try { + var worker = new Worker(relHref + 'styles/search-worker.js'); + if (!worker && !window.worker) { + localSearch(); + } else { + webWorkerSearch(); + } + + renderSearchBox(); + highlightKeywords(); + addSearchEvent(); + } catch (e) { + console.error(e); + } + + //Adjust the position of search box in navbar + function renderSearchBox() { + autoCollapse(); + $(window).on('resize', autoCollapse); + $(document).on('click', '.navbar-collapse.in', function (e) { + if ($(e.target).is('a')) { + $(this).collapse('hide'); + } + }); + + function autoCollapse() { + var navbar = $('#autocollapse'); + if (navbar.height() === null) { + setTimeout(autoCollapse, 300); + } + navbar.removeClass(collapsed); + if (navbar.height() > 60) { + navbar.addClass(collapsed); + } + } + } + + // Search factory + function localSearch() { + console.log("using local search"); + var lunrIndex = lunr(function () { + this.ref('href'); + this.field('title', { boost: 50 }); + this.field('keywords', { boost: 20 }); + }); + lunr.tokenizer.seperator = /[\s\-\.]+/; + var searchData = {}; + var searchDataRequest = new XMLHttpRequest(); + + var indexPath = relHref + "index.json"; + if (indexPath) { + searchDataRequest.open('GET', indexPath); + searchDataRequest.onload = function () { + if (this.status != 200) { + return; + } + searchData = JSON.parse(this.responseText); + for (var prop in searchData) { + if (searchData.hasOwnProperty(prop)) { + lunrIndex.add(searchData[prop]); + } + } + } + searchDataRequest.send(); + } + + $("body").bind("queryReady", function () { + var hits = lunrIndex.search(query); + var results = []; + hits.forEach(function (hit) { + var item = searchData[hit.ref]; + results.push({ 'href': item.href, 'title': item.title, 'keywords': item.keywords }); + }); + handleSearchResults(results); + }); + } + + function webWorkerSearch() { + console.log("using Web Worker"); + var indexReady = $.Deferred(); + + worker.onmessage = function (oEvent) { + switch (oEvent.data.e) { + case 'index-ready': + indexReady.resolve(); + break; + case 'query-ready': + var hits = oEvent.data.d; + handleSearchResults(hits); + break; + } + } + + indexReady.promise().done(function () { + $("body").bind("queryReady", function () { + worker.postMessage({ q: query }); + }); + if (query && (query.length >= 3)) { + worker.postMessage({ q: query }); + } + }); + } + + // Highlight the searching keywords + function highlightKeywords() { + var q = url('?q'); + if (q !== null) { + var keywords = q.split("%20"); + keywords.forEach(function (keyword) { + if (keyword !== "") { + $('.data-searchable *').mark(keyword); + $('article *').mark(keyword); + } + }); + } + } + + function addSearchEvent() { + $('body').bind("searchEvent", function () { + $('#search-query').keypress(function (e) { + return e.which !== 13; + }); + + $('#search-query').keyup(function () { + query = $(this).val(); + if (query.length < 3) { + flipContents("show"); + } else { + flipContents("hide"); + $("body").trigger("queryReady"); + $('#search-results>.search-list').text('Search Results for "' + query + '"'); + } + }).off("keydown"); + }); + } + + function flipContents(action) { + if (action === "show") { + $('.hide-when-search').show(); + $('#search-results').hide(); + } else { + $('.hide-when-search').hide(); + $('#search-results').show(); + } + } + + function relativeUrlToAbsoluteUrl(currentUrl, relativeUrl) { + var currentItems = currentUrl.split(/\/+/); + var relativeItems = relativeUrl.split(/\/+/); + var depth = currentItems.length - 1; + var items = []; + for (var i = 0; i < relativeItems.length; i++) { + if (relativeItems[i] === '..') { + depth--; + } else if (relativeItems[i] !== '.') { + items.push(relativeItems[i]); + } + } + return currentItems.slice(0, depth).concat(items).join('/'); + } + + function extractContentBrief(content) { + var briefOffset = 512; + var words = query.split(/\s+/g); + var queryIndex = content.indexOf(words[0]); + var briefContent; + if (queryIndex > briefOffset) { + return "..." + content.slice(queryIndex - briefOffset, queryIndex + briefOffset) + "..."; + } else if (queryIndex <= briefOffset) { + return content.slice(0, queryIndex + briefOffset) + "..."; + } + } + + function handleSearchResults(hits) { + var numPerPage = 10; + $('#pagination').empty(); + $('#pagination').removeData("twbs-pagination"); + if (hits.length === 0) { + $('#search-results>.sr-items').html('

No results found

'); + } else { + $('#pagination').twbsPagination({ + totalPages: Math.ceil(hits.length / numPerPage), + visiblePages: 5, + onPageClick: function (event, page) { + var start = (page - 1) * numPerPage; + var curHits = hits.slice(start, start + numPerPage); + $('#search-results>.sr-items').empty().append( + curHits.map(function (hit) { + var currentUrl = window.location.href; + var itemRawHref = relativeUrlToAbsoluteUrl(currentUrl, relHref + hit.href); + var itemHref = relHref + hit.href + "?q=" + query; + var itemTitle = hit.title; + var itemBrief = extractContentBrief(hit.keywords); + + var itemNode = $('
').attr('class', 'sr-item'); + var itemTitleNode = $('
').attr('class', 'item-title').append($('').attr('href', itemHref).attr("target", "_blank").text(itemTitle)); + var itemHrefNode = $('
').attr('class', 'item-href').text(itemRawHref); + var itemBriefNode = $('
').attr('class', 'item-brief').text(itemBrief); + itemNode.append(itemTitleNode).append(itemHrefNode).append(itemBriefNode); + return itemNode; + }) + ); + query.split(/\s+/).forEach(function (word) { + if (word !== '') { + $('#search-results>.sr-items *').mark(word); + } + }); + } + }); + } + } + }; + + // Update href in navbar + function renderNavbar() { + var navbar = $('#navbar ul')[0]; + if (typeof (navbar) === 'undefined') { + loadNavbar(); + } else { + $('#navbar ul a.active').parents('li').addClass(active); + renderBreadcrumb(); + } + + function loadNavbar() { + var navbarPath = $("meta[property='docfx\\:navrel']").attr("content"); + if (!navbarPath) { + return; + } + navbarPath = navbarPath.replace(/\\/g, '/'); + var tocPath = $("meta[property='docfx\\:tocrel']").attr("content") || ''; + if (tocPath) tocPath = tocPath.replace(/\\/g, '/'); + $.get(navbarPath, function (data) { + $(data).find("#toc>ul").appendTo("#navbar"); + if ($('#search-results').length !== 0) { + $('#search').show(); + $('body').trigger("searchEvent"); + } + var index = navbarPath.lastIndexOf('/'); + var navrel = ''; + if (index > -1) { + navrel = navbarPath.substr(0, index + 1); + } + $('#navbar>ul').addClass('navbar-nav'); + var currentAbsPath = util.getAbsolutePath(window.location.pathname); + // set active item + $('#navbar').find('a[href]').each(function (i, e) { + var href = $(e).attr("href"); + if (util.isRelativePath(href)) { + href = navrel + href; + $(e).attr("href", href); + + var isActive = false; + var originalHref = e.name; + if (originalHref) { + originalHref = navrel + originalHref; + if (util.getDirectory(util.getAbsolutePath(originalHref)) === util.getDirectory(util.getAbsolutePath(tocPath))) { + isActive = true; + } + } else { + if (util.getAbsolutePath(href) === currentAbsPath) { + var dropdown = $(e).attr('data-toggle') == "dropdown" + if (!dropdown) { + isActive = true; + } + } + } + if (isActive) { + $(e).addClass(active); + } + } + }); + renderNavbar(); + }); + } + } + + function renderSidebar() { + var sidetoc = $('#sidetoggle .sidetoc')[0]; + if (typeof (sidetoc) === 'undefined') { + loadToc(); + } else { + registerTocEvents(); + if ($('footer').is(':visible')) { + $('.sidetoc').addClass('shiftup'); + } + + // Scroll to active item + var top = 0; + $('#toc a.active').parents('li').each(function (i, e) { + $(e).addClass(active).addClass(expanded); + $(e).children('a').addClass(active); + top += $(e).position().top; + }) + $('.sidetoc').scrollTop(top - 50); + + if ($('footer').is(':visible')) { + $('.sidetoc').addClass('shiftup'); + } + + renderBreadcrumb(); + } + + function registerTocEvents() { + $('.toc .nav > li > .expand-stub').click(function (e) { + $(e.target).parent().toggleClass(expanded); + }); + $('.toc .nav > li > .expand-stub + a:not([href])').click(function (e) { + $(e.target).parent().toggleClass(expanded); + }); + $('#toc_filter_input').on('input', function (e) { + var val = this.value; + if (val === '') { + // Clear 'filtered' class + $('#toc li').removeClass(filtered).removeClass(hide); + return; + } + + // Get leaf nodes + $('#toc li>a').filter(function (i, e) { + return $(e).siblings().length === 0 + }).each(function (i, anchor) { + var text = $(anchor).attr('title'); + var parent = $(anchor).parent(); + var parentNodes = parent.parents('ul>li'); + for (var i = 0; i < parentNodes.length; i++) { + var parentText = $(parentNodes[i]).children('a').attr('title'); + if (parentText) text = parentText + '.' + text; + }; + if (filterNavItem(text, val)) { + parent.addClass(show); + parent.removeClass(hide); + } else { + parent.addClass(hide); + parent.removeClass(show); + } + }); + $('#toc li>a').filter(function (i, e) { + return $(e).siblings().length > 0 + }).each(function (i, anchor) { + var parent = $(anchor).parent(); + if (parent.find('li.show').length > 0) { + parent.addClass(show); + parent.addClass(filtered); + parent.removeClass(hide); + } else { + parent.addClass(hide); + parent.removeClass(show); + parent.removeClass(filtered); + } + }) + + function filterNavItem(name, text) { + if (!text) return true; + if (name && name.toLowerCase().indexOf(text.toLowerCase()) > -1) return true; + return false; + } + }); + } + + function loadToc() { + var tocPath = $("meta[property='docfx\\:tocrel']").attr("content"); + if (!tocPath) { + return; + } + tocPath = tocPath.replace(/\\/g, '/'); + $('#sidetoc').load(tocPath + " #sidetoggle > div", function () { + var index = tocPath.lastIndexOf('/'); + var tocrel = ''; + if (index > -1) { + tocrel = tocPath.substr(0, index + 1); + } + var currentHref = util.getAbsolutePath(window.location.pathname); + $('#sidetoc').find('a[href]').each(function (i, e) { + var href = $(e).attr("href"); + if (util.isRelativePath(href)) { + href = tocrel + href; + $(e).attr("href", href); + } + + if (util.getAbsolutePath(e.href) === currentHref) { + $(e).addClass(active); + } + + $(e).breakWord(); + }); + + renderSidebar(); + }); + } + } + + function renderBreadcrumb() { + var breadcrumb = []; + $('#navbar a.active').each(function (i, e) { + breadcrumb.push({ + href: e.href, + name: e.innerHTML + }); + }) + $('#toc a.active').each(function (i, e) { + breadcrumb.push({ + href: e.href, + name: e.innerHTML + }); + }) + + var html = util.formList(breadcrumb, 'breadcrumb'); + $('#breadcrumb').html(html); + } + + //Setup Affix + function renderAffix() { + var hierarchy = getHierarchy(); + if (hierarchy && hierarchy.length > 0) { + var html = '
In This Article
' + html += util.formList(hierarchy, ['nav', 'bs-docs-sidenav']); + $("#affix").empty().append(html); + if ($('footer').is(':visible')) { + $(".sideaffix").css("bottom", "70px"); + } + $('#affix a').click(function() { + var scrollspy = $('[data-spy="scroll"]').data()['bs.scrollspy']; + var target = e.target.hash; + if (scrollspy && target) { + scrollspy.activate(target); + } + }); + } + + function getHierarchy() { + // supported headers are h1, h2, h3, and h4 + var $headers = $($.map(['h1', 'h2', 'h3', 'h4'], function (h) { return ".article article " + h; }).join(", ")); + + // a stack of hierarchy items that are currently being built + var stack = []; + $headers.each(function (i, e) { + if (!e.id) { + return; + } + + var item = { + name: htmlEncode($(e).text()), + href: "#" + e.id, + items: [] + }; + + if (!stack.length) { + stack.push({ type: e.tagName, siblings: [item] }); + return; + } + + var frame = stack[stack.length - 1]; + if (e.tagName === frame.type) { + frame.siblings.push(item); + } else if (e.tagName[1] > frame.type[1]) { + // we are looking at a child of the last element of frame.siblings. + // push a frame onto the stack. After we've finished building this item's children, + // we'll attach it as a child of the last element + stack.push({ type: e.tagName, siblings: [item] }); + } else { // e.tagName[1] < frame.type[1] + // we are looking at a sibling of an ancestor of the current item. + // pop frames from the stack, building items as we go, until we reach the correct level at which to attach this item. + while (e.tagName[1] < stack[stack.length - 1].type[1]) { + buildParent(); + } + if (e.tagName === stack[stack.length - 1].type) { + stack[stack.length - 1].siblings.push(item); + } else { + stack.push({ type: e.tagName, siblings: [item] }); + } + } + }); + while (stack.length > 1) { + buildParent(); + } + + function buildParent() { + var childrenToAttach = stack.pop(); + var parentFrame = stack[stack.length - 1]; + var parent = parentFrame.siblings[parentFrame.siblings.length - 1]; + $.each(childrenToAttach.siblings, function (i, child) { + parent.items.push(child); + }); + } + if (stack.length > 0) { + + var topLevel = stack.pop().siblings; + if (topLevel.length === 1) { // if there's only one topmost header, dump it + return topLevel[0].items; + } + return topLevel; + } + return undefined; + } + + function htmlEncode(str) { + if (!str) return str; + return str + .replace(/&/g, '&') + .replace(/"/g, '"') + .replace(/'/g, ''') + .replace(//g, '>'); + } + + function htmlDecode(value) { + if (!str) return str; + return value + .replace(/"/g, '"') + .replace(/'/g, "'") + .replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&'); + } + + function cssEscape(str) { + // see: http://stackoverflow.com/questions/2786538/need-to-escape-a-special-character-in-a-jquery-selector-string#answer-2837646 + if (!str) return str; + return str + .replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, "\\$&"); + } + } + + // Show footer + function renderFooter() { + initFooter(); + $(window).on("scroll", showFooterCore); + + function initFooter() { + if (needFooter()) { + shiftUpBottomCss(); + $("footer").show(); + } else { + resetBottomCss(); + $("footer").hide(); + } + } + + function showFooterCore() { + if (needFooter()) { + shiftUpBottomCss(); + $("footer").fadeIn(); + } else { + resetBottomCss(); + $("footer").fadeOut(); + } + } + + function needFooter() { + var scrollHeight = $(document).height(); + var scrollPosition = $(window).height() + $(window).scrollTop(); + return (scrollHeight - scrollPosition) < 1; + } + + function resetBottomCss() { + $(".sidetoc").removeClass("shiftup"); + $(".sideaffix").removeClass("shiftup"); + } + + function shiftUpBottomCss() { + $(".sidetoc").addClass("shiftup"); + $(".sideaffix").addClass("shiftup"); + } + } + + function renderLogo() { + // For LOGO SVG + // Replace SVG with inline SVG + // http://stackoverflow.com/questions/11978995/how-to-change-color-of-svg-image-using-css-jquery-svg-image-replacement + jQuery('img.svg').each(function () { + var $img = jQuery(this); + var imgID = $img.attr('id'); + var imgClass = $img.attr('class'); + var imgURL = $img.attr('src'); + + jQuery.get(imgURL, function (data) { + // Get the SVG tag, ignore the rest + var $svg = jQuery(data).find('svg'); + + // Add replaced image's ID to the new SVG + if (typeof imgID !== 'undefined') { + $svg = $svg.attr('id', imgID); + } + // Add replaced image's classes to the new SVG + if (typeof imgClass !== 'undefined') { + $svg = $svg.attr('class', imgClass + ' replaced-svg'); + } + + // Remove any invalid XML tags as per http://validator.w3.org + $svg = $svg.removeAttr('xmlns:a'); + + // Replace image with new SVG + $img.replaceWith($svg); + + }, 'xml'); + }); + } + + function renderTabs() { + var contentAttrs = { + id: 'data-bi-id', + name: 'data-bi-name', + type: 'data-bi-type' + }; + + var Tab = (function () { + function Tab(li, a, section) { + this.li = li; + this.a = a; + this.section = section; + } + Object.defineProperty(Tab.prototype, "tabIds", { + get: function () { return this.a.getAttribute('data-tab').split(' '); }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Tab.prototype, "condition", { + get: function () { return this.a.getAttribute('data-condition'); }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Tab.prototype, "visible", { + get: function () { return !this.li.hasAttribute('hidden'); }, + set: function (value) { + if (value) { + this.li.removeAttribute('hidden'); + this.li.removeAttribute('aria-hidden'); + } + else { + this.li.setAttribute('hidden', 'hidden'); + this.li.setAttribute('aria-hidden', 'true'); + } + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Tab.prototype, "selected", { + get: function () { return !this.section.hasAttribute('hidden'); }, + set: function (value) { + if (value) { + this.a.setAttribute('aria-selected', 'true'); + this.a.tabIndex = 0; + this.section.removeAttribute('hidden'); + this.section.removeAttribute('aria-hidden'); + } + else { + this.a.setAttribute('aria-selected', 'false'); + this.a.tabIndex = -1; + this.section.setAttribute('hidden', 'hidden'); + this.section.setAttribute('aria-hidden', 'true'); + } + }, + enumerable: true, + configurable: true + }); + Tab.prototype.focus = function () { + this.a.focus(); + }; + return Tab; + }()); + + initTabs(document.body); + + function initTabs(container) { + var queryStringTabs = readTabsQueryStringParam(); + var elements = container.querySelectorAll('.tabGroup'); + var state = { groups: [], selectedTabs: [] }; + for (var i = 0; i < elements.length; i++) { + var group = initTabGroup(elements.item(i)); + if (!group.independent) { + updateVisibilityAndSelection(group, state); + state.groups.push(group); + } + } + container.addEventListener('click', function (event) { return handleClick(event, state); }); + if (state.groups.length === 0) { + return state; + } + selectTabs(queryStringTabs, container); + updateTabsQueryStringParam(state); + notifyContentUpdated(); + return state; + } + + function initTabGroup(element) { + var group = { + independent: element.hasAttribute('data-tab-group-independent'), + tabs: [] + }; + var li = element.firstElementChild.firstElementChild; + while (li) { + var a = li.firstElementChild; + a.setAttribute(contentAttrs.name, 'tab'); + var dataTab = a.getAttribute('data-tab').replace(/\+/g, ' '); + a.setAttribute('data-tab', dataTab); + var section = element.querySelector("[id=\"" + a.getAttribute('aria-controls') + "\"]"); + var tab = new Tab(li, a, section); + group.tabs.push(tab); + li = li.nextElementSibling; + } + element.setAttribute(contentAttrs.name, 'tab-group'); + element.tabGroup = group; + return group; + } + + function updateVisibilityAndSelection(group, state) { + var anySelected = false; + var firstVisibleTab; + for (var _i = 0, _a = group.tabs; _i < _a.length; _i++) { + var tab = _a[_i]; + tab.visible = tab.condition === null || state.selectedTabs.indexOf(tab.condition) !== -1; + if (tab.visible) { + if (!firstVisibleTab) { + firstVisibleTab = tab; + } + } + tab.selected = tab.visible && arraysIntersect(state.selectedTabs, tab.tabIds); + anySelected = anySelected || tab.selected; + } + if (!anySelected) { + for (var _b = 0, _c = group.tabs; _b < _c.length; _b++) { + var tabIds = _c[_b].tabIds; + for (var _d = 0, tabIds_1 = tabIds; _d < tabIds_1.length; _d++) { + var tabId = tabIds_1[_d]; + var index = state.selectedTabs.indexOf(tabId); + if (index === -1) { + continue; + } + state.selectedTabs.splice(index, 1); + } + } + var tab = firstVisibleTab; + tab.selected = true; + state.selectedTabs.push(tab.tabIds[0]); + } + } + + function getTabInfoFromEvent(event) { + if (!(event.target instanceof HTMLElement)) { + return null; + } + var anchor = event.target.closest('a[data-tab]'); + if (anchor === null) { + return null; + } + var tabIds = anchor.getAttribute('data-tab').split(' '); + var group = anchor.parentElement.parentElement.parentElement.tabGroup; + if (group === undefined) { + return null; + } + return { tabIds: tabIds, group: group, anchor: anchor }; + } + + function handleClick(event, state) { + var info = getTabInfoFromEvent(event); + if (info === null) { + return; + } + event.preventDefault(); + info.anchor.href = 'javascript:'; + setTimeout(function () { return info.anchor.href = '#' + info.anchor.getAttribute('aria-controls'); }); + var tabIds = info.tabIds, group = info.group; + var originalTop = info.anchor.getBoundingClientRect().top; + if (group.independent) { + for (var _i = 0, _a = group.tabs; _i < _a.length; _i++) { + var tab = _a[_i]; + tab.selected = arraysIntersect(tab.tabIds, tabIds); + } + } + else { + if (arraysIntersect(state.selectedTabs, tabIds)) { + return; + } + var previousTabId = group.tabs.filter(function (t) { return t.selected; })[0].tabIds[0]; + state.selectedTabs.splice(state.selectedTabs.indexOf(previousTabId), 1, tabIds[0]); + for (var _b = 0, _c = state.groups; _b < _c.length; _b++) { + var group_1 = _c[_b]; + updateVisibilityAndSelection(group_1, state); + } + updateTabsQueryStringParam(state); + } + notifyContentUpdated(); + var top = info.anchor.getBoundingClientRect().top; + if (top !== originalTop && event instanceof MouseEvent) { + window.scrollTo(0, window.pageYOffset + top - originalTop); + } + } + + function selectTabs(tabIds) { + for (var _i = 0, tabIds_1 = tabIds; _i < tabIds_1.length; _i++) { + var tabId = tabIds_1[_i]; + var a = document.querySelector(".tabGroup > ul > li > a[data-tab=\"" + tabId + "\"]:not([hidden])"); + if (a === null) { + return; + } + a.dispatchEvent(new CustomEvent('click', { bubbles: true })); + } + } + + function readTabsQueryStringParam() { + var qs = parseQueryString(); + var t = qs.tabs; + if (t === undefined || t === '') { + return []; + } + return t.split(','); + } + + function updateTabsQueryStringParam(state) { + var qs = parseQueryString(); + qs.tabs = state.selectedTabs.join(); + var url = location.protocol + "//" + location.host + location.pathname + "?" + toQueryString(qs) + location.hash; + if (location.href === url) { + return; + } + history.replaceState({}, document.title, url); + } + + function toQueryString(args) { + var parts = []; + for (var name_1 in args) { + if (args.hasOwnProperty(name_1) && args[name_1] !== '' && args[name_1] !== null && args[name_1] !== undefined) { + parts.push(encodeURIComponent(name_1) + '=' + encodeURIComponent(args[name_1])); + } + } + return parts.join('&'); + } + + function parseQueryString(queryString) { + var match; + var pl = /\+/g; + var search = /([^&=]+)=?([^&]*)/g; + var decode = function (s) { return decodeURIComponent(s.replace(pl, ' ')); }; + if (queryString === undefined) { + queryString = ''; + } + queryString = queryString.substring(1); + var urlParams = {}; + while (match = search.exec(queryString)) { + urlParams[decode(match[1])] = decode(match[2]); + } + return urlParams; + } + + function arraysIntersect(a, b) { + for (var _i = 0, a_1 = a; _i < a_1.length; _i++) { + var itemA = a_1[_i]; + for (var _a = 0, b_1 = b; _a < b_1.length; _a++) { + var itemB = b_1[_a]; + if (itemA === itemB) { + return true; + } + } + } + return false; + } + + function notifyContentUpdated() { + // Dispatch this event when needed + // window.dispatchEvent(new CustomEvent('content-update')); + } + } + + function utility() { + this.getAbsolutePath = getAbsolutePath; + this.isRelativePath = isRelativePath; + this.isAbsolutePath = isAbsolutePath; + this.getDirectory = getDirectory; + this.formList = formList; + + function getAbsolutePath(href) { + // Use anchor to normalize href + var anchor = $('')[0]; + // Ignore protocal, remove search and query + return anchor.host + anchor.pathname; + } + + function isRelativePath(href) { + if (href === undefined || href === '' || href[0] === '/') { + return false; + } + return !isAbsolutePath(href); + } + + function isAbsolutePath(href) { + return (/^(?:[a-z]+:)?\/\//i).test(href); + } + + function getDirectory(href) { + if (!href) return ''; + var index = href.lastIndexOf('/'); + if (index == -1) return ''; + if (index > -1) { + return href.substr(0, index); + } + } + + function formList(item, classes) { + var level = 1; + var model = { + items: item + }; + var cls = [].concat(classes).join(" "); + return getList(model, cls); + + function getList(model, cls) { + if (!model || !model.items) return null; + var l = model.items.length; + if (l === 0) return null; + var html = '
    '; + level++; + for (var i = 0; i < l; i++) { + var item = model.items[i]; + var href = item.href; + var name = item.name; + if (!name) continue; + html += href ? '
  • ' + name + '' : '
  • ' + name; + html += getList(item, cls) || ''; + html += '
    • '; + } + html += '
'; + return html; + } + } + + /** + * Add into long word. + * @param {String} text - The word to break. It should be in plain text without HTML tags. + */ + function breakPlainText(text) { + if (!text) return text; + return text.replace(/([a-z])([A-Z])|(\.)(\w)/g, '$1$3$2$4') + } + + /** + * Add into long word. The jQuery element should contain no html tags. + * If the jQuery element contains tags, this function will not change the element. + */ + $.fn.breakWord = function () { + if (this.html() == this.text()) { + this.html(function (index, text) { + return breakPlainText(text); + }) + } + return this; + } + } + + // adjusted from https://stackoverflow.com/a/13067009/1523776 + function workAroundFixedHeaderForAnchors() { + var HISTORY_SUPPORT = !!(history && history.pushState); + var ANCHOR_REGEX = /^#[^ ]+$/; + + function getFixedOffset() { + return $('header').first().height(); + } + + /** + * If the provided href is an anchor which resolves to an element on the + * page, scroll to it. + * @param {String} href + * @return {Boolean} - Was the href an anchor. + */ + function scrollIfAnchor(href, pushToHistory) { + var match, rect, anchorOffset; + + if (!ANCHOR_REGEX.test(href)) { + return false; + } + + match = document.getElementById(href.slice(1)); + + if (match) { + rect = match.getBoundingClientRect(); + anchorOffset = window.pageYOffset + rect.top - getFixedOffset(); + window.scrollTo(window.pageXOffset, anchorOffset); + + // Add the state to history as-per normal anchor links + if (HISTORY_SUPPORT && pushToHistory) { + history.pushState({}, document.title, location.pathname + href); + } + } + + return !!match; + } + + /** + * Attempt to scroll to the current location's hash. + */ + function scrollToCurrent() { + scrollIfAnchor(window.location.hash); + } + + /** + * If the click event's target was an anchor, fix the scroll position. + */ + function delegateAnchors(e) { + var elem = e.target; + + if (scrollIfAnchor(elem.getAttribute('href'), true)) { + e.preventDefault(); + } + } + + $(window).on('hashchange', scrollToCurrent); + // Exclude tabbed content case + $('a:not([data-tab])').click(delegateAnchors); + scrollToCurrent(); + } +}); diff --git a/Documentation/templates/unity_disqus/styles/main.css b/Documentation/templates/unity_disqus/styles/main.css new file mode 100644 index 0000000..51139e9 --- /dev/null +++ b/Documentation/templates/unity_disqus/styles/main.css @@ -0,0 +1,327 @@ +body { + color: #465563; + font-family: 'Roboto', sans-serif; + line-height: 1.5; + font-size: 16px; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + word-wrap: break-word +} + +#wrapper { + min-height: 100%; + position: absolute; + width: -webkit-fill-available; +} + +/* HEADINGS */ + +h1 { + font-weight: 600; + font-size: 32px; + color: #000; +} + +h2 { + font-weight: 600; + font-size: 24px; + line-height: 1.8; + color: #000; +} + +h3 { + font-weight: 600; + font-size: 20px; + line-height: 1.8; + color: #000; +} + +h5 { + font-size: 14px; + padding: 10px 0px; + color: #000; + font-weight: bold; +} + +article h1, article h2, article h3, article h4 { + margin-top: 35px; + margin-bottom: 15px; +} + +article h4 { + padding-bottom: 8px; + border-bottom: 2px solid #ddd; +} + +/* NAVBAR */ + +.navbar-brand>img { + color: #fff; +} + +.navbar { + border: none; + /* Both navbars use box-shadow */ + -webkit-box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5); + -moz-box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5); + box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5); +} + +.subnav { + border-top: 1px solid #ddd; + background-color: #fff; +} + +.navbar-inverse { + background-color: #262f39; + z-index: 100; +} + +ul.level1.breadcrumb>li>a { + color: #d54473; +} + +.navbar-inverse .navbar-nav>li>a, .navbar-inverse .navbar-text { + color: #fff; + background-color: #262f39; + border-bottom: 3px solid transparent; + padding-bottom: 12px; + text-decoration: none; +} + +.navbar-inverse .navbar-nav>li>a:focus, .navbar-inverse .navbar-nav>li>a:hover { + color: #00cccc; + background-color: #262f39; + border-bottom: 3px solid white; +} + +.navbar-inverse .navbar-nav>.active>a, .navbar-inverse .navbar-nav>.active>a:focus, .navbar-inverse .navbar-nav>.active>a:hover { + color: #00cccc; + background-color: #262f39; + border-bottom: 3px solid white; + text-decoration: underline; +} + +.navbar-form .form-control { + border: none; + border-radius: 20px; +} + +/* SIDEBAR */ + +.toc { + margin: 0px 1px 0px 0px; + padding: 0 20px; +} + +.toc .level1>li { + font-weight: 400; +} + +.toc .nav>li>a { + color: #455463; + text-decoration: none; +} + +.toc .nav>li>a:hover { + color: #455463; + text-decoration: underline; +} + +/*selected element in sidebar at level 2*/ +ul.nav.level2>li.active.in>a.active { + background: #222c37; + color: #fff; + padding: 5px 8px; + text-decoration: none; + font-weight: normal; +} + +.toc .nav>li.active>.expand-stub::before, .toc .nav>li.in>.expand-stub::before, .toc .nav>li.in.active>.expand-stub::before, .toc .nav>li.filtered>.expand-stub::before { + width: 12px; + height: 12px; + cursor: pointer; + border: #19e3b1 1px solid; + font-size: 8px; + background: #19e3b1; + color: #fff; + content: "-"; + display: table; + margin-top: 3px; + text-align: center; +} + +.toc .nav>li>.expand-stub::before, .toc .nav>li.active>.expand-stub::before { + width: 12px; + height: 12px; + cursor: pointer; + border: #19e3b1 1px solid; + font-size: 8px; + background: #19e3b1; + color: #fff; + content: "+"; + display: table; + margin-top: 3px; + text-align: center; +} + +.sidefilter { + background-color: #fff; + border-left: none; + border-right: none; +} + +.sidefilter { + background-color: #fff; + border-left: none; + border-right: none; +} + +.toc-filter { + padding: 10px; + margin: 0; +} + +.toc-filter>input { + border: 2px solid #ddd; + border-radius: 20px; +} + +.toc-filter>.filter-icon { + display: none; +} + +.sidetoc>.toc { + background-color: #fff; + overflow-x: hidden; + height: 100%; +} + +.sidetoc { + background-color: #ccf5f5; + border: none; + color: #ccf5f5; + padding-right: 8px; + height: 100%; +} + +/* ALERTS */ + +.alert { + padding: 0px 0px 5px 0px; + color: inherit; + background-color: inherit; + border: none; + box-shadow: 0px 2px 2px 0px rgba(100, 100, 100, 0.4); +} + +.alert>p { + margin-bottom: 0; + padding: 5px 10px; +} + +.alert>ul { + margin-bottom: 0; + padding: 5px 40px; +} + +.alert>h5 { + padding: 10px 15px; + margin-top: 0; + text-transform: uppercase; + font-weight: bold; + border-radius: 4px 4px 0 0; +} + +.alert-info>h5 { + color: #1976d2; + border-bottom: 4px solid #1976d2; + background-color: #e3f2fd; +} + +/*custom tip alert*/ +.alert-tip>h5 { + color: #d54473; + border-bottom: 4px solid #d54473; + background-color: #ffdfe9; + content: "\e162"; +} + +.alert-tip h5:before { + content: "\e162"; +} + +.alert-warning>h5 { + color: #f57f17; + border-bottom: 4px solid #f57f17; + background-color: #fff3e0; +} + +.alert-danger>h5 { + color: #d32f2f; + border-bottom: 4px solid #d32f2f; + background-color: #ffebee; +} + +.toc .nav>li.active>a { + color: #000; + text-decoration: none; + font-weight: bold; +} + +.toc .nav>li.active>a:hover { + color: #000; + text-decoration: underline; +} + +.toc .nav>li.active>a:focus { + color: #000; + text-decoration: underline; +} + +button, a { + color: #d54473; + cursor: pointer; + text-decoration: underline; +} + +button:hover, button:focus, a:hover, a:focus { + color: #d54473; + text-decoration: none; +} + +.affix>ul>li.active>a, .affix>ul>li.active>a:before { + color: #d54473; + font-weight: bold; +} + +.affix ul>li.active>a, .affix ul>li.active>a:before { + color: #d54473; +} + +/* CODE HIGHLIGHT */ + +pre { + font-family: Consolas, Monaco, 'Andale Mono', monospace; + padding: 20px; + margin: 0 0 30px 0; + border: #ddd 1px solid; + background: #fff; + font-size: 0.9375em; + color: #455463; + overflow: auto; + border-radius: 0px; +} + +/* Full width */ +@media (min-width:992px) { + .container { + width: 970px + } +} + +@media (min-width:1200px) { + .container { + width: 100%; + } +} \ No newline at end of file diff --git a/Documentation/toc.yml b/Documentation/toc.yml new file mode 100644 index 0000000..fbd0574 --- /dev/null +++ b/Documentation/toc.yml @@ -0,0 +1,4 @@ +- name: Manual + href: manual/ +- name: Scripting API + href: api/ From 3371878e826cdea9250bffd82b9834a1e2f16777 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 10:34:49 +0900 Subject: [PATCH 60/75] edit readme --- Packages/unity-utils/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Packages/unity-utils/README.md b/Packages/unity-utils/README.md index a126d27..adcdb16 100644 --- a/Packages/unity-utils/README.md +++ b/Packages/unity-utils/README.md @@ -1,7 +1,13 @@ # unity-utils +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![CodeFactor](https://www.codefactor.io/repository/github/unity-korea-community/unity-utils/badge)](https://www.codefactor.io/repository/github/unity-korea-community/unity-utils) +[![CodacyBadge](https://api.codacy.com/project/badge/Grade/7edcab32b58346089dc9fd84caff2bd8)](https://app.codacy.com/gh/unity-korea-community/unity-utils?utm_source=github.com&utm_medium=referral&utm_content=unity-korea-community/unity-utils&utm_campaign=Badge_Grade_Settings) ![release](https://img.shields.io/github/v/release/unity-korea-community/unity-utils) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7edcab32b58346089dc9fd84caff2bd8)](https://app.codacy.com/gh/unity-korea-community/unity-utils?utm_source=github.com&utm_medium=referral&utm_content=unity-korea-community/unity-utils&utm_campaign=Badge_Grade_Settings) +[![Discord](https://img.shields.io/discord/591914197219016707.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/FKXA2yzR) + +### CI Status + [![CI_SONAR_CLOUD](https://github.com/unity-korea-community/unity-utils/actions/workflows/sonarcloud-analysis.yml/badge.svg?branch=workspace)](https://github.com/unity-korea-community/unity-utils/actions/workflows/sonarcloud-analysis.yml) ## 소개 From 4f21eac3b56d7c39d9db7553b359454fff2c6776 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 10:42:14 +0900 Subject: [PATCH 61/75] edit readme --- Packages/unity-utils/README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Packages/unity-utils/README.md b/Packages/unity-utils/README.md index adcdb16..87bc39d 100644 --- a/Packages/unity-utils/README.md +++ b/Packages/unity-utils/README.md @@ -9,6 +9,7 @@ ### CI Status [![CI_SONAR_CLOUD](https://github.com/unity-korea-community/unity-utils/actions/workflows/sonarcloud-analysis.yml/badge.svg?branch=workspace)](https://github.com/unity-korea-community/unity-utils/actions/workflows/sonarcloud-analysis.yml) +[![CI_Documentation](https://github.com/unity-korea-community/unity-utils/actions/workflows/documentation.yml/badge.svg)](https://github.com/unity-korea-community/unity-utils/actions/workflows/documentation.yml) ## 소개 @@ -18,19 +19,19 @@ ## 기능 -* SimplePool<T> - 간단하게 사용하는 제네릭 오브젝트 풀 클래스입니다. - * 바로 써도 되고, 상속해서 `OnSpawn`, `OnDeSpawn`등을 override해서 사용할 수 있습니다. - * 테스 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/SimplePoolTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/SimplePoolTests.cs) -* DataSender<T> - IObservable<T>, IDisposable - * 옵저버 클래스입니다. - * 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/DataSenderTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/DataSenderTests.cs) -* Extensions - * Collection Extension - * `ToStringCollection`\(\), `Foreach`\(\), `Dequeue`\(\), `Pop`\(\) 등 지원 - * 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/CollectionExtensionTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/CollectionExtensionTests.cs) - * Random Extension - * IEnumerable<T>.`Random`\(\), List.`Shuffle()`등 지원 - * 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/RandomExtensionTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/RandomExtensionTests.cs) +- SimplePool<T> - 간단하게 사용하는 제네릭 오브젝트 풀 클래스입니다. + - 바로 써도 되고, 상속해서 `OnSpawn`, `OnDeSpawn`등을 override해서 사용할 수 있습니다. + - 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/SimplePoolTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/SimplePoolTests.cs) +- DataSender<T> - IObservable<T>, IDisposable + - 옵저버 클래스입니다. + - 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/DataSenderTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/DataSenderTests.cs) +- Extensions + - Collection Extension + - `ToStringCollection()`, `Foreach()`, `Dequeue()`, `Pop()` 등 지원 + - 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/CollectionExtensionTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/CollectionExtensionTests.cs) + - Random Extension + - IEnumerable<T>.`Random()`, List.`Shuffle()`등 지원 + - 테스트 코드: [https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/RandomExtensionTests.cs](https://github.com/unity-korea-community/unity-utils/blob/master/Tests/Runtime/RandomExtensionTests.cs) ## 설치 @@ -41,4 +42,3 @@ Add package from git URL 클릭 후‌ 이 저장소의 URL 입력‌ ​[https://github.com/unity-korea-community/unity-utils.git](https://github.com/unity-korea-community/unity-utils.git) - From aea689ad8373f7a024f25c616089b4a60a749ea5 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 10:55:55 +0900 Subject: [PATCH 62/75] edit docfx.json --- Documentation/docfx.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Documentation/docfx.json b/Documentation/docfx.json index 00bb84f..2ad8d8e 100644 --- a/Documentation/docfx.json +++ b/Documentation/docfx.json @@ -8,12 +8,6 @@ } } }, - "overwrite": [ - { - "src": "..", - "files": ["Packages/unity-utils/**/*.md"] - } - ], "metadata": [ { "src": [ From 35cae8c9f0cbfc7fe3d24284f1d5da0039116736 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:09:10 +0900 Subject: [PATCH 63/75] edit ci documentation --- .github/workflows/documentation.yml | 4 ++++ Documentation/docfx.json | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 83c744f..2739a74 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -22,6 +22,10 @@ jobs: run: | cp Packages/${{ github.event.repository.name }}/README.md Documentation/index.md + # csproj 생성 + - name: Generate Solution + run: unity-editor -nographics -logFile /dev/stdout -customBuildName $PROJECT_NAME -projectPath . -executeMethod UnityEditor.SyncVS.SyncSolution -quit + - name: Build run: docfx Documentation/docfx.json diff --git a/Documentation/docfx.json b/Documentation/docfx.json index 2ad8d8e..22f82b8 100644 --- a/Documentation/docfx.json +++ b/Documentation/docfx.json @@ -1,19 +1,10 @@ { - "sitemap": { - "baseUrl": "https://unity-korea-community.github.io/unity-utils", - "changefreq": "weekly", - "fileOptions": { - "api/*": { - "changefreq": "daily" - } - } - }, "metadata": [ { "src": [ { "src": "..", - "files": ["Packages/unity-utils/**/*.cs"] + "files": ["*.csproj"] } ], "globalNamespaceId": "Global", From 8d8cd17efd780ed1adf401ce64b8339b9bb50c62 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:12:32 +0900 Subject: [PATCH 64/75] edit ci documentation --- .github/workflows/documentation.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 2739a74..b98023d 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -10,10 +10,25 @@ jobs: build: runs-on: windows-latest # Required by DocFX steps: + - name: Activate unity + # exit code is 1 for manual activation + continue-on-error: true + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + run: | + echo "$UNITY_LICENSE" | tr -d '\r' > UnityLicenseFile.ulf + unity-editor -nographics -logFile /dev/stdout -manualLicenseFile UnityLicenseFile.ulf -quit + - name: Checkout uses: actions/checkout@v2 # with: # submodules: true + - name: Cache Library + id: cache-library + uses: actions/cache@v2 + with: + path: Library + key: Library-2020.1.17 - name: Install DocFX run: choco install -y docfx From 920df5d59cac9522285d095a86fa29798bc32a0e Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:18:45 +0900 Subject: [PATCH 65/75] edit ci documentation --- .github/workflows/documentation.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b98023d..0d4cfdd 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,6 +9,10 @@ jobs: # Build the documentation build: runs-on: windows-latest # Required by DocFX + # available list of containers here: + # https://hub.docker.com/r/unityci/editor/tags?page=1&ordering=last_updated&name=ubuntu-2020.1.17f1-base + container: unityci/editor:2021.1.10f1-windows-mono-0 + steps: - name: Activate unity # exit code is 1 for manual activation From 7d4fa86ccbac4b290923b93963749505a33ea842 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:22:10 +0900 Subject: [PATCH 66/75] edit ci documentation --- .github/workflows/documentation.yml | 23 - .gitignore | 1 - unko.unity-utils.runtime.csproj | 594 ++++++++++++++++++++++++ unko.unity-utils.runtime.tests.csproj | 620 ++++++++++++++++++++++++++ 4 files changed, 1214 insertions(+), 24 deletions(-) create mode 100644 unko.unity-utils.runtime.csproj create mode 100644 unko.unity-utils.runtime.tests.csproj diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 0d4cfdd..83c744f 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,30 +9,11 @@ jobs: # Build the documentation build: runs-on: windows-latest # Required by DocFX - # available list of containers here: - # https://hub.docker.com/r/unityci/editor/tags?page=1&ordering=last_updated&name=ubuntu-2020.1.17f1-base - container: unityci/editor:2021.1.10f1-windows-mono-0 - steps: - - name: Activate unity - # exit code is 1 for manual activation - continue-on-error: true - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - run: | - echo "$UNITY_LICENSE" | tr -d '\r' > UnityLicenseFile.ulf - unity-editor -nographics -logFile /dev/stdout -manualLicenseFile UnityLicenseFile.ulf -quit - - name: Checkout uses: actions/checkout@v2 # with: # submodules: true - - name: Cache Library - id: cache-library - uses: actions/cache@v2 - with: - path: Library - key: Library-2020.1.17 - name: Install DocFX run: choco install -y docfx @@ -41,10 +22,6 @@ jobs: run: | cp Packages/${{ github.event.repository.name }}/README.md Documentation/index.md - # csproj 생성 - - name: Generate Solution - run: unity-editor -nographics -logFile /dev/stdout -customBuildName $PROJECT_NAME -projectPath . -executeMethod UnityEditor.SyncVS.SyncSolution -quit - - name: Build run: docfx Documentation/docfx.json diff --git a/.gitignore b/.gitignore index 3fc2686..6740a04 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ UserSettings Temp obj -*.csproj *.sln Packages/packages-lock.json package.json.meta diff --git a/unko.unity-utils.runtime.csproj b/unko.unity-utils.runtime.csproj new file mode 100644 index 0000000..8aea1f2 --- /dev/null +++ b/unko.unity-utils.runtime.csproj @@ -0,0 +1,594 @@ + + + + latest + + + Debug + AnyCPU + 10.0.20506 + 2.0 + + {ad0be950-7c25-f476-c8e5-b3d6fcd5bcbe} + Library + Properties + unko.unity-utils.runtime + v4.7.1 + 512 + . + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_2020_1_17;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;aaa;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + prompt + 4 + 0169 + False + + + true + true + false + false + false + + + + + + + + + + + + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEditor.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEditor.UI.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEngine.UI.dll + + + + + + + diff --git a/unko.unity-utils.runtime.tests.csproj b/unko.unity-utils.runtime.tests.csproj new file mode 100644 index 0000000..6f49ee7 --- /dev/null +++ b/unko.unity-utils.runtime.tests.csproj @@ -0,0 +1,620 @@ + + + + latest + + + Debug + AnyCPU + 10.0.20506 + 2.0 + + {95b1ccf8-a67c-d59a-026c-2c431091f223} + Library + Properties + unko.unity-utils.runtime.tests + v4.7.1 + 512 + . + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_2020_1_17;UNITY_2020_1;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;aaa;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0 + prompt + 4 + 0169 + False + + + true + true + false + false + false + + + + + + + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEditor.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/Managed/UnityEditor.Graphs.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll + + + C:/Program Files/Unity/Hub/Editor/2020.1.17f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEditor.UI.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEngine.UI.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + + + C:/Users/user/Desktop/Project/Unity_Merge/Unity_Merge/Packages/unity-utils/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + + + + + {ad0be950-7c25-f476-c8e5-b3d6fcd5bcbe} + unko.unity-utils.runtime + + + + + From 4d9d08602b6b508362cc785e5f429738526f6a4d Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:29:56 +0900 Subject: [PATCH 67/75] edit action --- .github/workflows/sonarcloud-analysis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index c899f02..19819b9 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -84,7 +84,9 @@ jobs: node-version: '14' - name: Generate Solution - run: unity-editor -nographics -logFile /dev/stdout -customBuildName $PROJECT_NAME -projectPath . -executeMethod UnityEditor.SyncVS.SyncSolution -quit + run: | + find . -name '*.csproj' #-delete + unity-editor -nographics -logFile /dev/stdout -customBuildName $PROJECT_NAME -projectPath . -executeMethod UnityEditor.SyncVS.SyncSolution -quit - name: SonarQube analysis env: From d91449de37d546bfcbbea0ea346c47d7b83ddbd3 Mon Sep 17 00:00:00 2001 From: strix Date: Sun, 6 Jun 2021 11:37:05 +0900 Subject: [PATCH 68/75] edit docfx --- Documentation/docfx.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/docfx.json b/Documentation/docfx.json index 22f82b8..23ecfef 100644 --- a/Documentation/docfx.json +++ b/Documentation/docfx.json @@ -1,17 +1,4 @@ { - "metadata": [ - { - "src": [ - { - "src": "..", - "files": ["*.csproj"] - } - ], - "globalNamespaceId": "Global", - "filter": "filterConfig.yml", - "dest": "api" - } - ], "build": { "globalMetadata": { "_gitContribute": { @@ -54,5 +41,18 @@ "xref": ["https://normanderwan.github.io/UnityXrefMaps/xrefmap.yml"], "xrefService": ["https://xref.docs.microsoft.com/query?uid={uid}"], "dest": "../_site" - } + }, + "metadata": [ + { + "src": [ + { + "src": "..", + "files": ["*.csproj"] + } + ], + "globalNamespaceId": "Global", + "filter": "filterConfig.yml", + "dest": "api" + } + ] } From 61c8e765de1b7152edf0ca2eed565ccad27853e0 Mon Sep 17 00:00:00 2001 From: Strix Date: Mon, 7 Jun 2021 14:22:09 +0900 Subject: [PATCH 69/75] Update docfx.json --- Documentation/docfx.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/docfx.json b/Documentation/docfx.json index 23ecfef..215c2db 100644 --- a/Documentation/docfx.json +++ b/Documentation/docfx.json @@ -1,4 +1,17 @@ { + "metadata": [ + { + "src": [ + { + "src": "..", + "files": ["*.csproj"] + } + ], + "globalNamespaceId": "Global", + "filter": "filterConfig.yml", + "dest": "api" + } + ], "build": { "globalMetadata": { "_gitContribute": { @@ -41,18 +54,5 @@ "xref": ["https://normanderwan.github.io/UnityXrefMaps/xrefmap.yml"], "xrefService": ["https://xref.docs.microsoft.com/query?uid={uid}"], "dest": "../_site" - }, - "metadata": [ - { - "src": [ - { - "src": "..", - "files": ["*.csproj"] - } - ], - "globalNamespaceId": "Global", - "filter": "filterConfig.yml", - "dest": "api" - } - ] + } } From b03d8c63bfd9b6950bc261bd443237888a5d7463 Mon Sep 17 00:00:00 2001 From: KorStrix Date: Tue, 8 Jun 2021 14:48:29 +0000 Subject: [PATCH 70/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- .../unity-utils/Runtime/StateMachineGeneric.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Packages/unity-utils/Runtime/StateMachineGeneric.cs b/Packages/unity-utils/Runtime/StateMachineGeneric.cs index 4cb0710..1ca763c 100644 --- a/Packages/unity-utils/Runtime/StateMachineGeneric.cs +++ b/Packages/unity-utils/Runtime/StateMachineGeneric.cs @@ -97,7 +97,6 @@ public void Start(MonoBehaviour owner, STATE_ID startState, params STATE_ID[] ne _owner.StartCoroutine(UpdateCoroutine()); } - /// /// 스테이트를 다음 스테이트로 변경합니다. /// @@ -106,12 +105,27 @@ public void ChangeState(STATE_ID state) { if (_debug) { - Debug.Log($"{_owner.name}.FSM.ChangeState changeState:{state}, wait:{_waitQueue.ToStringCollection()}", _owner); + Debug.Log($"{_owner.name}.FSM.{nameof(ChangeState)} changeState:{state}, wait:{_waitQueue.ToStringCollection()}", _owner); } _commandQueue.Add(new Command(CommandType.Change, state)); } + /// + /// 스테이트를 다음 스테이트로 즉시 변경합니다. + /// + /// 변경할 스테이트 + public void ChangeStateImmediately(STATE_ID state) + { + if (_debug) + { + Debug.Log($"{_owner.name}.FSM.{nameof(ChangeStateImmediately)} changeState:{state}, wait:{_waitQueue.ToStringCollection()}", _owner); + } + + OnFinishState(); + OnStartState(state); + } + /// /// 현재 스테이트를 종료합니다. /// From e9be297f525a402ff6fadc103d2b775f459504a4 Mon Sep 17 00:00:00 2001 From: KorStrix Date: Tue, 28 Sep 2021 09:31:35 +0000 Subject: [PATCH 71/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- .../Runtime/Extension/CollectionExtension.cs | 68 +++++- .../Runtime/Extension/JsonUtilityExtension.cs | 25 +++ .../JsonUtilityExtension.cs.meta} | 2 +- .../Runtime/Extension/MonoBehaviourEx.cs | 28 +++ .../Runtime/Extension/MonoBehaviourEx.cs.meta | 11 + .../Runtime/Extension/RandomExtension.cs | 90 ++++++-- Packages/unity-utils/Runtime/SimplePool.cs | 54 +++-- .../Runtime/SingletonComponentBase.cs | 13 +- .../unity-utils/Runtime/SpriteAnimation.meta | 8 + .../SpriteAnimation/SpriteAnimation.cs | 197 ++++++++++++++++++ .../SpriteAnimation/SpriteAnimation.cs.meta | 11 + .../SpriteAnimationImageRenderer.cs | 35 ++++ .../SpriteAnimationImageRenderer.cs.meta | 11 + .../SpriteAnimationSpriteRenderer.cs | 34 +++ .../SpriteAnimationSpriteRenderer.cs.meta | 11 + .../Runtime/StateMachineGeneric.cs | 48 ++--- .../unity-utils/Runtime/UnityComponentPool.cs | 120 +++++++++++ .../Runtime/UnityComponentPool.cs.meta | 11 + .../Runtime/UnitytComponentPool.cs | 55 ----- .../Tests/Runtime/DataSenderTests.cs | 22 +- .../Tests/Runtime/RandomExtensionTests.cs | 16 +- .../Tests/Runtime/SimplePoolTests.cs | 24 +-- 22 files changed, 746 insertions(+), 148 deletions(-) create mode 100644 Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs rename Packages/unity-utils/Runtime/{UnitytComponentPool.cs.meta => Extension/JsonUtilityExtension.cs.meta} (83%) create mode 100644 Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs create mode 100644 Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs.meta create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation.meta create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs.meta create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs.meta create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs create mode 100644 Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs.meta create mode 100644 Packages/unity-utils/Runtime/UnityComponentPool.cs create mode 100644 Packages/unity-utils/Runtime/UnityComponentPool.cs.meta delete mode 100644 Packages/unity-utils/Runtime/UnitytComponentPool.cs diff --git a/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs b/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs index 278d1ed..5520152 100644 --- a/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs +++ b/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Text; @@ -31,11 +32,6 @@ public static string ToStringCollection(this T[] target) return _stringBuilder.ToString(); } - public static HashSet ToHashSet(this IEnumerable target) - { - return new HashSet(target); - } - public static IEnumerable Foreach(this IEnumerable target, System.Action OnEach) { foreach (var item in target) @@ -46,6 +42,17 @@ public static IEnumerable Foreach(this IEnumerable target, System.Actio return target; } + public static bool IsEmpty(this T[] target) + { + return target == null || target.Length == 0; + } + + public static HashSet ToHashSet(this IEnumerable target) + { + return new HashSet(target); + } + + public static T Dequeue(this List target) { int index = 0; @@ -63,5 +70,52 @@ public static T Pop(this List target) return item; } + + public static Dictionary ToDictionaryEx(this IEnumerable source, System.Func keySelector) + => ToDictionaryEx(source, keySelector, UnityEngine.Debug.LogError); + + public static Dictionary ToDictionaryEx(this IEnumerable source, System.Func keySelector, System.Action OnError) + { + Dictionary dictionary = new Dictionary(); + foreach (var eachSource in source) + { + TKey key = keySelector(eachSource); + if (dictionary.ContainsKey(key)) + { + OnError($"{nameof(ToDictionaryEx)} already ContainKey, key:{key}, added Source:{dictionary[key]}, try add source:{eachSource}"); + continue; + } + dictionary.Add(key, eachSource); + } + + return dictionary; + } + + public static bool TryGetValueEx(this IReadOnlyDictionary target, TKey key, out TValue value) + => TryGetValueEx(target, key, out value, UnityEngine.Debug.LogError); + + public static bool TryGetValueEx(this IReadOnlyDictionary target, TKey key, out TValue value, System.Action OnError) + { + value = default; + if (target == null) + { + OnError($"Dictionary is null, key:{key}"); + return false; + } + + if (key == null) + { + OnError($"key is null value"); + return false; + } + + bool result = target.TryGetValue(key, out value); + if (!result) + { + OnError($"key:{key} not found in dictionary"); + } + + return result; + } } -} +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs b/Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs new file mode 100644 index 0000000..58437db --- /dev/null +++ b/Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +public static class JsonUtilityEx +{ + public static bool TryFromJson(string json, out T result) + => TryFromJson(json, out result, Debug.LogError); + + public static bool TryFromJson(string json, out T result, System.Action OnError) + { + result = default; + bool isSuccess = true; + + try + { + result = JsonUtility.FromJson(json); + } + catch (System.Exception error) + { + OnError(error.ToString()); + isSuccess = false; + } + + return isSuccess; + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/UnitytComponentPool.cs.meta b/Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs.meta similarity index 83% rename from Packages/unity-utils/Runtime/UnitytComponentPool.cs.meta rename to Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs.meta index 384960c..2c514bb 100644 --- a/Packages/unity-utils/Runtime/UnitytComponentPool.cs.meta +++ b/Packages/unity-utils/Runtime/Extension/JsonUtilityExtension.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f2791524e959a642891953ec02e71d3 +guid: ae08fadc3ff69b2498a2b6f9aa03cd86 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs new file mode 100644 index 0000000..16b3d90 --- /dev/null +++ b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public static class MonoBehaviourEx +{ + public static void StartCoroutineNotOverlap(this MonoBehaviour target, string coroutineName) + { + target.StopCoroutine(coroutineName); + target.StartCoroutine(coroutineName); + } + + public static T GetOrAddComponent(this Component target) + where T : Component + => target.gameObject.GetOrAddComponent(); + + public static T GetOrAddComponent(this GameObject target) + where T : Component + { + T returnComponent = target.GetComponent(); + if (returnComponent != null) + { + return returnComponent; + } + + return target.AddComponent(); + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs.meta b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs.meta new file mode 100644 index 0000000..6d903ab --- /dev/null +++ b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d38c3ee7713a2f447a510920c4fe56e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/Extension/RandomExtension.cs b/Packages/unity-utils/Runtime/Extension/RandomExtension.cs index 090804f..ea114dd 100644 --- a/Packages/unity-utils/Runtime/Extension/RandomExtension.cs +++ b/Packages/unity-utils/Runtime/Extension/RandomExtension.cs @@ -15,26 +15,72 @@ public static T Random(this IEnumerable target) return target.ElementAt(randomIndex); } - public static T Random(this IEnumerable target, System.Func getPercentage) + public static T Random(this T[] target, System.Func getPercentage) { - int totalvariable = 0; - target.Foreach(item => totalvariable += getPercentage(item)); - int random = Next(0, totalvariable); + int totalVariable = 0; + for (int i = 0; i < target.Length; i++) + { + totalVariable += getPercentage(target[i], i); + } + int random = Next(totalVariable); - totalvariable = 0; - foreach (T item in target) + totalVariable = 0; + for (int i = 0; i < target.Length; i++) { - totalvariable += getPercentage(item); - if (random < totalvariable) + totalVariable += getPercentage(target[i], i); + if (random < totalVariable) { - return item; + return target[i]; } } return default; } - public static T Random(this IEnumerable target, System.Func onFilter) + public static T Random(this IReadOnlyList target, System.Func getPercentage) + { + int totalVariable = 0; + for (int i = 0; i < target.Count; i++) + { + totalVariable += getPercentage(target[i], i); + } + int random = Next(totalVariable); + + totalVariable = 0; + for (int i = 0; i < target.Count; i++) + { + totalVariable += getPercentage(target[i], i); + if (random < totalVariable) + { + return target[i]; + } + } + + return default; + } + + public static T Random(this IReadOnlyList target, System.Func getPercentage) + { + float totalVariable = 0; + for (int i = 0; i < target.Count; i++) + { + totalVariable += getPercentage(target[i], i); + } + float random = Next(totalVariable); + + totalVariable = 0; + for (int i = 0; i < target.Count; i++) + { + totalVariable += getPercentage(target[i], i); + if (random < totalVariable) + { + return target[i]; + } + } + + return default; + } + public static T Random(this IReadOnlyList target, System.Func onFilter) { IEnumerable filteredTarget = target.Where(onFilter); int randomIndex = Next(0, filteredTarget.Count()); @@ -65,11 +111,7 @@ public static int Next() /// /// 최대값, 랜덤값은 이 값이 될 수 없음 /// - public static int Next(int max) - { - InitRandom(); - return _local.Next(max); - } + public static int Next(int max) => Next(0, max); /// /// 범위형 int 랜덤 @@ -83,6 +125,24 @@ public static int Next(int min, int max) return _local.Next(min, max); } + /// + /// 범위형 float 랜덤 + /// + /// 최대값, 랜덤값은 이 값이 될 수 없음 + /// + public static float Next(float max) => Next(0f, max); + + /// + /// 범위형 float 랜덤 + /// + /// 최대값, 랜덤값은 이 값이 될 수 없음 + /// + public static float Next(float min, float max) + { + InitRandom(); + return (float)_local.NextDouble() * (max - min) + min; + } + private static void InitRandom() { if (_local == null) diff --git a/Packages/unity-utils/Runtime/SimplePool.cs b/Packages/unity-utils/Runtime/SimplePool.cs index 97d7c45..86bed29 100644 --- a/Packages/unity-utils/Runtime/SimplePool.cs +++ b/Packages/unity-utils/Runtime/SimplePool.cs @@ -1,17 +1,22 @@ using System; using System.Collections.Generic; using System.Linq; +using UnityEngine; namespace UNKO.Utils { - public class SimplePool + public class SimplePool : IDisposable where T : class { - protected List _allInstance = new List(); public IReadOnlyList allInstance => _allInstance; - protected List _use = new List(); public IReadOnlyList use => _use; - protected List _notUse = new List(); public IReadOnlyList notUse => _notUse; + [SerializeField] + protected List _allInstance = new List(); public IReadOnlyList AllInstance => _allInstance; + [SerializeField] + protected List _use = new List(); public IReadOnlyList Use => _use; + [SerializeField] + protected List _notUse = new List(); public IReadOnlyList NotUse => _notUse; - protected T _originItem { get; private set; } + [SerializeField] + private T _originItem = null; public T OriginItem => _originItem; protected Func _OnCreateInstance; public SimplePool(T originItem) @@ -38,9 +43,22 @@ public SimplePool(Func onCreateInstance, int initializeSize) Init(onCreateInstance(), initializeSize); } + public void PrePooling(int prePoolCount) + { + for (int i = 0; i < prePoolCount; i++) + { + Spawn(); + } + + DeSpawnAll(); + } + + public bool IsEmptyPool() + => _notUse.Count == 0 && _allInstance.Count > 0; + public T Spawn() { - T spawnItem = null; + T spawnItem; if (_notUse.Count > 0) { int lastIndex = _notUse.Count - 1; @@ -49,7 +67,7 @@ public T Spawn() } else { - spawnItem = OnRequireNewInstance(_originItem); + spawnItem = OnRequireNewInstance(OriginItem); _allInstance.Add(spawnItem); } @@ -60,6 +78,12 @@ public T Spawn() public void DeSpawn(T item) { + if (item == null) + { + Debug.LogError($"despawn item is null"); + return; + } + if (_use.Contains(item) == false) { return; @@ -78,6 +102,8 @@ public void DeSpawnAll() } } + public virtual void OnDisposeItem(T item) { } + protected virtual T OnRequireNewInstance(T originItem) => _OnCreateInstance(originItem); protected virtual void OnSpawn(T spawnTarget) { } protected virtual void OnDespawn(T despawnTarget) { } @@ -85,12 +111,16 @@ protected virtual void OnDespawn(T despawnTarget) { } protected void Init(T originItem, int initializeSize) { _originItem = originItem; + PrePooling(initializeSize); + } - for (int i = 0; i < initializeSize; i++) - { - Spawn(); - } - DeSpawnAll(); + public virtual void Dispose() + { + _allInstance.Foreach(OnDisposeItem); + _allInstance.Clear(); + + _use.Clear(); + _notUse.Clear(); } } } diff --git a/Packages/unity-utils/Runtime/SingletonComponentBase.cs b/Packages/unity-utils/Runtime/SingletonComponentBase.cs index fa45563..1022e91 100644 --- a/Packages/unity-utils/Runtime/SingletonComponentBase.cs +++ b/Packages/unity-utils/Runtime/SingletonComponentBase.cs @@ -1,5 +1,6 @@ using UnityEngine; +#pragma warning disable IDE1006 namespace UNKO.Utils { public abstract class SingletonComponentBase : MonoBehaviour @@ -17,7 +18,10 @@ public static T instance if (_instance == null) { _instance = FindObjectOfType(); - _instance.InitSingleton(); + if (_isInitSingleton == false) + { + _instance.InitSingleton(); + } } return _instance; @@ -26,17 +30,19 @@ public static T instance private static T _instance { get; set; } private static bool _isQuitApp { get; set; } + private static bool _isInitSingleton { get; set; } protected virtual void Awake() { - if (_instance == null) + if (_isInitSingleton == false) { InitSingleton(); } } - protected virtual void InitSingleton() + public virtual void InitSingleton() { + _isInitSingleton = true; } private void OnApplicationQuit() @@ -45,3 +51,4 @@ private void OnApplicationQuit() } } } +#pragma warning restore IDE1006 diff --git a/Packages/unity-utils/Runtime/SpriteAnimation.meta b/Packages/unity-utils/Runtime/SpriteAnimation.meta new file mode 100644 index 0000000..23e280b --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ce407f64ed2c514e9f10ad1c11ad703 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs new file mode 100644 index 0000000..9a370a3 --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs @@ -0,0 +1,197 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.Events; + +public interface ISpriteAnimationRenderer +{ + void UpdateSprite(Sprite sprite); +} + +[ExecuteInEditMode] +public class SpriteAnimation : MonoBehaviour +{ + public enum UpdateMode + { + GameTime, + RealTime, + } + + public IReadOnlyList AnimatedSprites => _animatedSprites; + public float FrameCount => _frameCount; + public bool IsLoop => _isLoop; + + [SerializeField] + List _animatedSprites = new List(); + [SerializeField] + float _playBeforeDelay = 0f; + [SerializeField] + float _frameCount = 1f; + [SerializeField] + UpdateMode _updateMode = UpdateMode.RealTime; + [SerializeField] + bool _isPlayOnEnable = false; + [SerializeField] + bool _isLoop = true; + + // NOTE unity event는 보통 인스펙터 최하단에 있기 때문에 여기에 배치 + public UnityEvent OnStartAnimation = new UnityEvent(); + public UnityEvent OnFinishAnimation = new UnityEvent(); + + public bool IsPlaying { get; private set; } + List _renderers = new List(); + Coroutine _playCoroutine; + + public static SpriteAnimation GerOrAddSpriteAnimationImage(GameObject target) + { + SpriteAnimation spriteAnimation = target.GetOrAddComponent(); + target.GetOrAddComponent().SetSpriteAnimation(spriteAnimation); + + return spriteAnimation; + } + + public static SpriteAnimation GerOrAddSpriteAnimationSprite(GameObject target) + { + SpriteAnimation spriteAnimation = target.GetOrAddComponent(); + target.GetOrAddComponent().SetSpriteAnimation(spriteAnimation); + + return spriteAnimation; + } + + public void AddRenderer(ISpriteAnimationRenderer renderer) + => _renderers.Add(renderer); + + public void RemoveRenderer(ISpriteAnimationRenderer renderer) + => _renderers.Remove(renderer); + + public void ClearRenderer() + => _renderers.Clear(); + + public void PlayEffect() + => Play(); + + public IEnumerator Play() + { + Stop(); + + if (_animatedSprites.Count == 0) + { + Debug.LogError($"{name}({typeof(SpriteAnimation)}).{nameof(Play)}() fail, _animatedSprites.Count == 0", this); + return null; + } + + System.Func getYield = (waitTime) => new WaitForSeconds(waitTime); + switch (_updateMode) + { + case UpdateMode.RealTime: + getYield = (waitTime) => new WaitForSecondsRealtime(waitTime); + break; + } + + UpdateRenderer(_animatedSprites.FirstOrDefault()); + IEnumerator routine = PlayCoroutine(getYield); + _playCoroutine = StartCoroutine(routine); + return routine; + } + + public void Stop() + { + if (_playCoroutine != null) + { + StopCoroutine(_playCoroutine); + _playCoroutine = null; + } + + IsPlaying = false; + } + + public void SetAnimatedSprite(params Sprite[] sprites) + { + _animatedSprites.Clear(); + _animatedSprites.AddRange(sprites); + } + + public void SetPlayBeforeDelay(float delay) => _playBeforeDelay = delay; + public void SetFrameCount(float frameCount) => _frameCount = frameCount; + public void SetIsLoop(bool isLoop) => _isLoop = isLoop; + public void SetPlayOnEnable(bool enable) => _isPlayOnEnable = enable; + public void SetUpdateMode(UpdateMode updateMode) => _updateMode = updateMode; + + private void OnEnable() + { + if (Application.isPlaying) + { + if (_isPlayOnEnable) + { + Play(); + } + } + else + { + UpdateRenderer(_animatedSprites.FirstOrDefault()); + } + } + + + IEnumerator PlayCoroutine(System.Func getYield) + { + yield return getYield(_playBeforeDelay); + + IsPlaying = true; + + int spriteCount = _animatedSprites.Count; + float waitSecondsPerFrame = CalculateWaitSecondsPerFrame(); + + do + { + int spriteIndex = 0; + OnStartAnimation.Invoke(this); + while (spriteIndex < spriteCount) + { + UpdateRenderer(_animatedSprites[spriteIndex++]); + yield return getYield(waitSecondsPerFrame); + } + OnFinishAnimation.Invoke(this); + } while (IsLoop); + + IsPlaying = false; + } + + private void UpdateRenderer(Sprite sprite) + { + _renderers.ForEach(renderer => renderer.UpdateSprite(sprite)); + } + + private float CalculateWaitSecondsPerFrame() + { + return 1f / _frameCount; + } +} + +#if UNITY_EDITOR +[UnityEditor.CustomEditor(typeof(SpriteAnimation))] +public class SpriteAnimationEditor : UnityEditor.Editor +{ + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + SpriteAnimation animation = target as SpriteAnimation; + if (animation.IsPlaying) + { + if (GUILayout.Button("Stop")) + { + animation.Stop(); + } + } + else + { + if (GUILayout.Button("Play")) + { + animation.Play(); + } + } + } +} +#endif \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs.meta b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs.meta new file mode 100644 index 0000000..f72636b --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd10a8487e053134e9b2552954c28f9d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs new file mode 100644 index 0000000..292f93e --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using UnityEngine.UI; + +public class SpriteAnimationImageRenderer : MonoBehaviour, ISpriteAnimationRenderer +{ + [SerializeField] + SpriteAnimation _spriteAnimation = null; + [SerializeField] + Image _image = null; + + private void Awake() + { + if (_image == null) + { + _image = GetComponent(); + } + + if (_spriteAnimation == null) + { + _spriteAnimation = GetComponent(); + } + + _spriteAnimation.AddRenderer(this); + } + + public void SetSpriteAnimation(SpriteAnimation spriteAnimation) + { + _spriteAnimation = spriteAnimation; + } + + public void UpdateSprite(Sprite sprite) + { + _image.sprite = sprite; + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs.meta b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs.meta new file mode 100644 index 0000000..d8430b3 --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationImageRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88aba6fa975fbbd4db2c502908719836 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs new file mode 100644 index 0000000..113f11f --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs @@ -0,0 +1,34 @@ +using UnityEngine; + +public class SpriteAnimationSpriteRenderer : MonoBehaviour, ISpriteAnimationRenderer +{ + [SerializeField] + SpriteAnimation _spriteAnimation = null; + [SerializeField] + SpriteRenderer _spriteRenderer = null; + + private void Awake() + { + if (_spriteRenderer == null) + { + _spriteRenderer = GetComponent(); + } + + if (_spriteAnimation == null) + { + _spriteAnimation = GetComponent(); + } + + _spriteAnimation.AddRenderer(this); + } + + public void SetSpriteAnimation(SpriteAnimation spriteAnimation) + { + _spriteAnimation = spriteAnimation; + } + + public void UpdateSprite(Sprite sprite) + { + _spriteRenderer.sprite = sprite; + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs.meta b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs.meta new file mode 100644 index 0000000..9518667 --- /dev/null +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimationSpriteRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b59bdf3e5c7f08e4287b0f0d8b0526ae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/StateMachineGeneric.cs b/Packages/unity-utils/Runtime/StateMachineGeneric.cs index 1ca763c..eea95e5 100644 --- a/Packages/unity-utils/Runtime/StateMachineGeneric.cs +++ b/Packages/unity-utils/Runtime/StateMachineGeneric.cs @@ -29,29 +29,29 @@ public enum CommandType [System.Serializable] public struct Command : System.IEquatable { - public CommandType commandType { get; private set; } - public STATE_ID stateID { get; private set; } + public CommandType CommandType { get; private set; } + public STATE_ID StateID { get; private set; } public Command(CommandType commandType) { - this.commandType = commandType; - stateID = default; + this.CommandType = commandType; + StateID = default; } public Command(CommandType commandType, STATE_ID stateID) { - this.commandType = commandType; - this.stateID = stateID; + this.CommandType = commandType; + this.StateID = stateID; } public bool Equals(Command other) { - if (commandType.Equals(other.commandType) == false) + if (CommandType.Equals(other.CommandType) == false) { return false; } - return stateID.Equals(other.stateID); + return StateID.Equals(other.StateID); } } @@ -60,11 +60,11 @@ public bool Equals(Command other) [SerializeField] private bool _debug; - public STATE_ID currentStateID => _currentStateID; + public STATE_ID CurrentStateID => _currentStateID; [SerializeField] private STATE_ID _currentStateID; - public TSTATE currentState { get; private set; } + public TSTATE CurrentState { get; private set; } protected MonoBehaviour _owner; protected Dictionary _stateInstance; @@ -157,7 +157,7 @@ public StateMachineGeneric ForEachState(System.Action public StateMachineGeneric Clear() { ClearQueue(); - currentState = null; + CurrentState = null; _currentStateID = default; return this; @@ -180,7 +180,7 @@ IEnumerator UpdateCoroutine() ProcessCommand(_commandQueue.Dequeue()); } - if (currentState == null && _waitQueue.Count > 0) + if (CurrentState == null && _waitQueue.Count > 0) { OnStartState(_waitQueue.Dequeue()); } @@ -191,10 +191,10 @@ IEnumerator UpdateCoroutine() private void ProcessCommand(Command command) { - switch (command.commandType) + switch (command.CommandType) { case CommandType.Change: - OnStartState(command.stateID); + OnStartState(command.StateID); break; case CommandType.Finish: @@ -210,7 +210,7 @@ private void OnStartState(STATE_ID stateID) { if (_debug) { - Debug.Log($"{_owner.name}.FSM.OnStartState.Entry current:{currentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner); + Debug.Log($"{_owner.name}.FSM.OnStartState.Entry current:{CurrentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner); } if (_stateInstance.TryGetValue(stateID, out TSTATE state) == false) @@ -219,43 +219,43 @@ private void OnStartState(STATE_ID stateID) return; } - if (state.Equals(currentState)) + if (state.Equals(CurrentState)) { return; } if (_debug) { - Debug.Log($"{_owner.name}.FSM.OnStartState.Execute current:{currentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner); + Debug.Log($"{_owner.name}.FSM.OnStartState.Execute current:{CurrentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner); } - currentState?.OnChangeState(state); + CurrentState?.OnChangeState(state); state.OnAwake(); - currentState = state; + CurrentState = state; _currentStateID = stateID; _currentCoroutine = _owner.StartCoroutine(StateCoroutine()); - OnChangeState?.Invoke(stateID, currentState); + OnChangeState?.Invoke(stateID, CurrentState); } private void OnFinishState() { if (_debug) { - Debug.Log($"{_owner.name}.FSM.OnFinishState current:{currentStateID}, wait:{_waitQueue.ToStringCollection()}"); + Debug.Log($"{_owner.name}.FSM.OnFinishState current:{CurrentStateID}, wait:{_waitQueue.ToStringCollection()}"); } if (_currentCoroutine != null) { _owner.StopCoroutine(_currentCoroutine); } - currentState?.OnFinishState(); - currentState = null; + CurrentState?.OnFinishState(); + CurrentState = null; _currentStateID = default; } private IEnumerator StateCoroutine() { - yield return currentState.OnStartCoroutine(); + yield return CurrentState.OnStartCoroutine(); _commandQueue.Add(new Command(CommandType.Finish)); } } diff --git a/Packages/unity-utils/Runtime/UnityComponentPool.cs b/Packages/unity-utils/Runtime/UnityComponentPool.cs new file mode 100644 index 0000000..1c7cd38 --- /dev/null +++ b/Packages/unity-utils/Runtime/UnityComponentPool.cs @@ -0,0 +1,120 @@ +using System; +using UnityEngine; + +namespace UNKO.Utils +{ + [Serializable] + public class UnityComponentPool : SimplePool + where TComponent : Component + { + Transform _parent; + + public UnityComponentPool(TComponent originItem) : base(originItem) + { + originItem.gameObject.SetActive(false); + _OnCreateInstance = (TComponent origin) => GameObject.Instantiate(origin); + } + + public UnityComponentPool(TComponent originItem, int initializeSize) : base(originItem, initializeSize) + { + originItem.gameObject.SetActive(false); + _OnCreateInstance = (TComponent origin) => GameObject.Instantiate(origin); + } + + public UnityComponentPool(Func onCreateInstance) : base(onCreateInstance) + { + } + + public UnityComponentPool(Func onCreateInstance, int initializeSize) : base(onCreateInstance, initializeSize) + { + } + + public void SetParents(Transform parent) + { + _parent = CreateParents_IfNull(parent); + } + + protected override TComponent OnRequireNewInstance(TComponent originItem) + { + TComponent newInstance = base.OnRequireNewInstance(originItem); + newInstance.transform.SetParent(_parent); + + newInstance.gameObject.SetActive(false); + return newInstance; + } + + protected override void OnSpawn(TComponent spawnTarget) + { + base.OnSpawn(spawnTarget); + + if (spawnTarget == null) + { + return; + } + + spawnTarget.gameObject.SetActive(true); + +#if UNITY_EDITOR + UpdateUI(); +#endif + } + + protected override void OnDespawn(TComponent despawnTarget) + { + base.OnDespawn(despawnTarget); + + GameObject despawnObject = despawnTarget.gameObject; + if (despawnObject.activeInHierarchy) + { + despawnObject.SetActive(false); + } + + despawnObject.transform.SetParent(_parent); + +#if UNITY_EDITOR + UpdateUI(); +#endif + } + + public override void OnDisposeItem(TComponent item) + { + base.OnDisposeItem(item); + + if (item == null) + { + return; + } + + GameObject.Destroy(item.gameObject); + } + + private Transform CreateParents_IfNull(Transform parent) + { + if (parent == null) + { + parent = new GameObject(GetName()).transform; + } + + return parent; + } + + private void UpdateUI() + { + if (_parent == null) + { + _parent = CreateParents_IfNull(null); + } + _parent.gameObject.name = $"{GetName()}.Pool/use:{_use.Count}/notUse:{_notUse.Count}/all:{_allInstance.Count}"; + } + + private string GetName() + { + const int MAX_NAME_LENGTH = 5; + + string name = typeof(TComponent).Name; + name = name.Substring(0, MAX_NAME_LENGTH); + + return $"{name}.{OriginItem.name}"; + } + } +} diff --git a/Packages/unity-utils/Runtime/UnityComponentPool.cs.meta b/Packages/unity-utils/Runtime/UnityComponentPool.cs.meta new file mode 100644 index 0000000..5ba0c29 --- /dev/null +++ b/Packages/unity-utils/Runtime/UnityComponentPool.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ca494223e23b2c49a5889052b447cae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/UnitytComponentPool.cs b/Packages/unity-utils/Runtime/UnitytComponentPool.cs deleted file mode 100644 index 0b06299..0000000 --- a/Packages/unity-utils/Runtime/UnitytComponentPool.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using UnityEngine; - -namespace UNKO.Utils -{ - public class UnitytComponentPool : SimplePool - where T : UnityEngine.Component - { - Transform _parent; - - public UnitytComponentPool(T originItem) : base(originItem) - { - originItem.gameObject.SetActive(false); - } - - public UnitytComponentPool(T originItem, int initializeSize) : base(originItem, initializeSize) - { - originItem.gameObject.SetActive(false); - } - - public UnitytComponentPool(Func onCreateInstance) : base(onCreateInstance) - { - } - - public UnitytComponentPool(Func onCreateInstance, int initializeSize) : base(onCreateInstance, initializeSize) - { - } - - public UnitytComponentPool SetParents(Transform parent) - { - _parent = parent; - - return this; - } - - protected override T OnRequireNewInstance(T originItem) - { - T newInstance = base.OnRequireNewInstance(originItem); - if (_parent != null) - { - newInstance.transform.SetParent(_parent); - } - - newInstance.gameObject.SetActive(false); - return newInstance; - } - - protected override void OnSpawn(T spawnTarget) - { - base.OnSpawn(spawnTarget); - - spawnTarget.gameObject.SetActive(true); - } - } -} diff --git a/Packages/unity-utils/Tests/Runtime/DataSenderTests.cs b/Packages/unity-utils/Tests/Runtime/DataSenderTests.cs index 08291ad..32d2aca 100644 --- a/Packages/unity-utils/Tests/Runtime/DataSenderTests.cs +++ b/Packages/unity-utils/Tests/Runtime/DataSenderTests.cs @@ -7,24 +7,24 @@ public class DataSenderTests { public class TestData { - public string stringData { get; private set; } - public int numberData { get; private set; } + public string StringData { get; private set; } + public int NumberData { get; private set; } public TestData(int numberData) { - this.stringData = numberData.ToString(); - this.numberData = numberData; + this.StringData = numberData.ToString(); + this.NumberData = numberData; } } public class TestSender : MonoBehaviour { - public DataSender sender { get; private set; } = new DataSender(); + public DataSender Sender { get; private set; } = new DataSender(); } public class TestReceiver : MonoBehaviour, IObserver { - public TestData data { get; private set; } + public TestData Data { get; private set; } public void OnCompleted() { @@ -38,7 +38,7 @@ public void OnError(Exception error) public void OnNext(TestData value) { - this.data = value; + this.Data = value; } } @@ -49,14 +49,14 @@ public void 사용예시() TestSender senderComponent = new GameObject(nameof(TestSender)).AddComponent(); TestReceiver receiverComponent = new GameObject(nameof(TestReceiver)).AddComponent(); receiverComponent.transform.SetParent(senderComponent.transform); - senderComponent.sender.InitChildrenComponents(senderComponent); + senderComponent.Sender.InitChildrenComponents(senderComponent); // Act TestData testData = new TestData(UnityEngine.Random.Range(1, 100)); - senderComponent.sender.SendData(testData); + senderComponent.Sender.SendData(testData); // Assert - Assert.AreEqual(receiverComponent.data.stringData, testData.stringData); - Assert.AreEqual(receiverComponent.data.numberData, testData.numberData); + Assert.AreEqual(receiverComponent.Data.StringData, testData.StringData); + Assert.AreEqual(receiverComponent.Data.NumberData, testData.NumberData); } } diff --git a/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs b/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs index 7bdcc28..b4121ed 100644 --- a/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs +++ b/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs @@ -16,13 +16,13 @@ public void RandomWorks() public class Item { - public string name { get; private set; } - public int percent { get; private set; } + public string Name { get; private set; } + public int Percent { get; private set; } public Item(string name, int percent) { - this.name = name; - this.percent = percent; + this.Name = name; + this.Percent = percent; } } @@ -45,11 +45,11 @@ public void RandomPercent() // Act for (int i = 0; i < gotchaCount; i++) { - Item gotcha = items.Random(item => item.percent); + Item gotcha = items.Random((item, index) => item.Percent); foreach (var hasItem in hasItemCount) { string key = hasItem.Key; - if (gotcha.name.StartsWith(key)) + if (gotcha.Name.StartsWith(key)) { hasItemCount[key]++; break; @@ -62,9 +62,9 @@ public void RandomPercent() { Item item = items[i]; float errorRate = 0.5f; // 랜덤에 걸리지 않기 위해 범위를 많이 넓힘 - int expectCount = (int)(gotchaCount * (item.percent / 100f)); + int expectCount = (int)(gotchaCount * (item.Percent / 100f)); int errorRange = (int)(expectCount * errorRate); - KeyValuePair itemCount = hasItemCount.First(hasItem => item.name.StartsWith(hasItem.Key)); + KeyValuePair itemCount = hasItemCount.First(hasItem => item.Name.StartsWith(hasItem.Key)); Assert.GreaterOrEqual(itemCount.Value, expectCount - errorRange); } diff --git a/Packages/unity-utils/Tests/Runtime/SimplePoolTests.cs b/Packages/unity-utils/Tests/Runtime/SimplePoolTests.cs index 3400b8c..a16a1b1 100644 --- a/Packages/unity-utils/Tests/Runtime/SimplePoolTests.cs +++ b/Packages/unity-utils/Tests/Runtime/SimplePoolTests.cs @@ -8,26 +8,26 @@ public class SimplePoolTests { public class SimplePoolTarget { - public static int instanceCount { get; private set; } + public static int InstanceCount { get; private set; } public static void Reset_InstanceCount() { - instanceCount = 0; + InstanceCount = 0; } static public class Factory { static public SimplePoolTarget CreateInstance_FromFactory() { - return new SimplePoolTarget { isCreateFromFactory = true }; + return new SimplePoolTarget { IsCreateFromFactory = true }; } } - public bool isCreateFromFactory { get; private set; } + public bool IsCreateFromFactory { get; private set; } public SimplePoolTarget() { - instanceCount++; + InstanceCount++; } } @@ -40,8 +40,8 @@ public void 생성자에서_미리풀에생성할수있습니다() int instanceCount = Random.Range(1, 10); SimplePool pool = new SimplePool(origin, instanceCount); - Assert.AreEqual(pool.allInstance.Count, instanceCount); - Assert.AreEqual(SimplePoolTarget.instanceCount, instanceCount); + Assert.AreEqual(pool.AllInstance.Count, instanceCount); + Assert.AreEqual(SimplePoolTarget.InstanceCount, instanceCount); } [Test] @@ -66,9 +66,9 @@ public void 사용예시() } } - Assert.AreEqual(pool.allInstance.Count, totalInstanceCount); - Assert.AreEqual(pool.use.Count, 0); - Assert.AreEqual(pool.notUse.Count, totalInstanceCount); + Assert.AreEqual(pool.AllInstance.Count, totalInstanceCount); + Assert.AreEqual(pool.Use.Count, 0); + Assert.AreEqual(pool.NotUse.Count, totalInstanceCount); } public class PoolEx : SimplePool @@ -89,9 +89,9 @@ public void 사용예시_생성자Override() SimplePoolTarget.Reset_InstanceCount(); int instanceCount = Random.Range(1, 10); PoolEx poolEx = new PoolEx(instanceCount); - Assert.AreEqual(poolEx.allInstance.Count, instanceCount); + Assert.AreEqual(poolEx.AllInstance.Count, instanceCount); SimplePoolTarget target = poolEx.Spawn(); - Assert.AreEqual(target.isCreateFromFactory, true); + Assert.AreEqual(target.IsCreateFromFactory, true); } } From aa2d3a10459c35fe53d28b13d274dbfc003341bd Mon Sep 17 00:00:00 2001 From: KorStrix Date: Tue, 28 Sep 2021 09:44:06 +0000 Subject: [PATCH 72/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- Packages/unity-utils/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/unity-utils/package.json b/Packages/unity-utils/package.json index 520958a..74df1f0 100644 --- a/Packages/unity-utils/package.json +++ b/Packages/unity-utils/package.json @@ -1,6 +1,6 @@ { "name": "com.unko.unity-utils", - "version": "1.0.3", + "version": "1.0.4", "displayName": "UNKO Utils", "description": "This is an example package", "unity": "2019.1", @@ -15,4 +15,4 @@ "type": "git", "url": "https://github.com/unity-korea-community/unity-utils.git" } -} \ No newline at end of file +} From 706f68b94d1bffb3aa95d8eb2f177666c059b4c7 Mon Sep 17 00:00:00 2001 From: KorStrix Date: Tue, 28 Sep 2021 10:03:44 +0000 Subject: [PATCH 73/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- Packages/unity-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/unity-utils/package.json b/Packages/unity-utils/package.json index 74df1f0..9a55744 100644 --- a/Packages/unity-utils/package.json +++ b/Packages/unity-utils/package.json @@ -1,6 +1,6 @@ { "name": "com.unko.unity-utils", - "version": "1.0.4", + "version": "1.0.5", "displayName": "UNKO Utils", "description": "This is an example package", "unity": "2019.1", From 442aefba71d680c0894859cd0b2319a017de6425 Mon Sep 17 00:00:00 2001 From: KorStrix Date: Mon, 20 Dec 2021 11:18:57 +0000 Subject: [PATCH 74/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- .../Runtime/Extension/CollectionExtension.cs | 31 ++++++- .../Runtime/Extension/MonoBehaviourEx.cs | 13 +++ .../Runtime/Extension/StringExtension.cs | 86 +++++++++++++++++++ .../Runtime/Extension/StringExtension.cs.meta | 11 +++ Packages/unity-utils/Runtime/SimplePool.cs | 2 +- Packages/unity-utils/Runtime/SingletonBase.cs | 33 +++++++ .../unity-utils/Runtime/SingletonBase.cs.meta | 11 +++ .../Runtime/SingletonComponentBase.cs | 31 ++++++- .../unity-utils/Runtime/SingletonSOBase.cs | 27 ++++++ .../Runtime/SingletonSOBase.cs.meta | 11 +++ .../SpriteAnimation/SpriteAnimation.cs | 12 ++- .../Runtime/StateMachineGeneric.cs | 4 +- .../unity-utils/Runtime/UnityComponentPool.cs | 5 ++ .../Tests/Runtime/CollectionExtensionTests.cs | 2 +- .../Tests/Runtime/RandomExtensionTests.cs | 2 +- 15 files changed, 272 insertions(+), 9 deletions(-) create mode 100644 Packages/unity-utils/Runtime/Extension/StringExtension.cs create mode 100644 Packages/unity-utils/Runtime/Extension/StringExtension.cs.meta create mode 100644 Packages/unity-utils/Runtime/SingletonBase.cs create mode 100644 Packages/unity-utils/Runtime/SingletonBase.cs.meta create mode 100644 Packages/unity-utils/Runtime/SingletonSOBase.cs create mode 100644 Packages/unity-utils/Runtime/SingletonSOBase.cs.meta diff --git a/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs b/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs index 5520152..4106204 100644 --- a/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs +++ b/Packages/unity-utils/Runtime/Extension/CollectionExtension.cs @@ -32,7 +32,7 @@ public static string ToStringCollection(this T[] target) return _stringBuilder.ToString(); } - public static IEnumerable Foreach(this IEnumerable target, System.Action OnEach) + public static IEnumerable ForEach(this IEnumerable target, System.Action OnEach) { foreach (var item in target) { @@ -62,6 +62,11 @@ public static T Dequeue(this List target) return item; } + public static void Push(this List target, T addedItem) + { + target.Add(addedItem); + } + public static T Pop(this List target) { int index = target.Count - 1; @@ -71,6 +76,14 @@ public static T Pop(this List target) return item; } + public static T Peek(this List target) + { + int index = target.Count - 1; + T item = target[index]; + + return item; + } + public static Dictionary ToDictionaryEx(this IEnumerable source, System.Func keySelector) => ToDictionaryEx(source, keySelector, UnityEngine.Debug.LogError); @@ -91,6 +104,12 @@ public static Dictionary ToDictionaryEx(this IEnum return dictionary; } + public static TValue GetValueEx(this IReadOnlyDictionary target, TKey key) + { + target.TryGetValueEx(key, out TValue value); + return value; + } + public static bool TryGetValueEx(this IReadOnlyDictionary target, TKey key, out TValue value) => TryGetValueEx(target, key, out value, UnityEngine.Debug.LogError); @@ -117,5 +136,15 @@ public static bool TryGetValueEx(this IReadOnlyDictionary(this IEnumerable target) + { + return target == null || target.Count() == 0; + } + + public static bool IsNullOrZeroCount(this Array target) + { + return target == null || target.Length == 0; + } } } \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs index 16b3d90..45e62f5 100644 --- a/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs +++ b/Packages/unity-utils/Runtime/Extension/MonoBehaviourEx.cs @@ -25,4 +25,17 @@ public static T GetOrAddComponent(this GameObject target) return target.AddComponent(); } + + public static void SetActive(this Component target, bool active) + => target.gameObject.SetActive(active); + + public static bool IsNull(this GameObject target) + { + return target is null; + } + + public static bool IsNull(this Component target) + { + return target is null; + } } \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/Extension/StringExtension.cs b/Packages/unity-utils/Runtime/Extension/StringExtension.cs new file mode 100644 index 0000000..2eeca50 --- /dev/null +++ b/Packages/unity-utils/Runtime/Extension/StringExtension.cs @@ -0,0 +1,86 @@ +using System; +using UnityEngine; + +namespace UNKO.Utils +{ + public static class StringExtension + { + public static void CutString(this string cutTarget, System.Action OnCutString) + => CutString(cutTarget, 300, OnCutString); + + public static void CutString(this string cutTarget, int maxCutLength, System.Action OnCutString) + { + if (cutTarget == null) + { + return; + } + + string cutTargetCopy = cutTarget; + do + { + int cutLength = Mathf.Min(cutTargetCopy.Length, maxCutLength); + string cutString = cutTargetCopy.Substring(0, cutLength); + OnCutString(cutString); + + cutTargetCopy = cutTargetCopy.Substring(cutLength, cutTargetCopy.Length - cutLength); + } while (cutTargetCopy.Length > 0); + } + + /// + /// Calculate percentage similarity of two strings + /// Source String to Compare with + /// Targeted String to Compare + /// Return Similarity between two strings from 0 to 1.0 + /// + /// + public static float CalculateSimilarity(this string source, string target) + { + if ((source == null) || (target == null)) return 0.0f; + if ((source.Length == 0) || (target.Length == 0)) return 0.0f; + if (source == target) return 1.0f; + + int stepsToSame = ComputeLevenshteinDistance(source, target); + return (1.0f - (stepsToSame / (float)Math.Max(source.Length, target.Length))); + } + /// + /// Returns the number of steps required to transform the source string + /// into the target string. + /// + public static int ComputeLevenshteinDistance(string source, string target) + { + if ((source == null) || (target == null)) return 0; + if ((source.Length == 0) || (target.Length == 0)) return 0; + if (source == target) return source.Length; + + int sourceWordCount = source.Length; + int targetWordCount = target.Length; + + // Step 1 + if (sourceWordCount == 0) + return targetWordCount; + + if (targetWordCount == 0) + return sourceWordCount; + + int[,] distance = new int[sourceWordCount + 1, targetWordCount + 1]; + + // Step 2 + for (int i = 0; i <= sourceWordCount; distance[i, 0] = i++) ; + for (int j = 0; j <= targetWordCount; distance[0, j] = j++) ; + + for (int i = 1; i <= sourceWordCount; i++) + { + for (int j = 1; j <= targetWordCount; j++) + { + // Step 3 + int cost = (target[j - 1] == source[i - 1]) ? 0 : 1; + + // Step 4 + distance[i, j] = Math.Min(Math.Min(distance[i - 1, j] + 1, distance[i, j - 1] + 1), distance[i - 1, j - 1] + cost); + } + } + + return distance[sourceWordCount, targetWordCount]; + } + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/Extension/StringExtension.cs.meta b/Packages/unity-utils/Runtime/Extension/StringExtension.cs.meta new file mode 100644 index 0000000..a1fe53f --- /dev/null +++ b/Packages/unity-utils/Runtime/Extension/StringExtension.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 285084f40810c3345b9081722bd607cb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SimplePool.cs b/Packages/unity-utils/Runtime/SimplePool.cs index 86bed29..0a4899e 100644 --- a/Packages/unity-utils/Runtime/SimplePool.cs +++ b/Packages/unity-utils/Runtime/SimplePool.cs @@ -116,7 +116,7 @@ protected void Init(T originItem, int initializeSize) public virtual void Dispose() { - _allInstance.Foreach(OnDisposeItem); + CollectionExtension.ForEach(_allInstance, this.OnDisposeItem); _allInstance.Clear(); _use.Clear(); diff --git a/Packages/unity-utils/Runtime/SingletonBase.cs b/Packages/unity-utils/Runtime/SingletonBase.cs new file mode 100644 index 0000000..51042d5 --- /dev/null +++ b/Packages/unity-utils/Runtime/SingletonBase.cs @@ -0,0 +1,33 @@ +#pragma warning disable IDE1006 +namespace UNKO.Utils +{ + public abstract class SingletonBase + where T : SingletonBase, new() + { + public static T instance + { + get + { + if (_instance == null) + { + _instance = new T(); + _instance.InitSingleton(); + } + + return _instance; + } + } + + private static T _instance { get; set; } + + public virtual void InitSingleton() + { + } + + static public T CreateInstance() + { + return instance; + } + } +} +#pragma warning restore IDE1006 diff --git a/Packages/unity-utils/Runtime/SingletonBase.cs.meta b/Packages/unity-utils/Runtime/SingletonBase.cs.meta new file mode 100644 index 0000000..9b1c047 --- /dev/null +++ b/Packages/unity-utils/Runtime/SingletonBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc068cc30adf3df44adb4b66cc7d8806 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SingletonComponentBase.cs b/Packages/unity-utils/Runtime/SingletonComponentBase.cs index 1022e91..b095e1c 100644 --- a/Packages/unity-utils/Runtime/SingletonComponentBase.cs +++ b/Packages/unity-utils/Runtime/SingletonComponentBase.cs @@ -1,9 +1,10 @@ -using UnityEngine; +using System; +using UnityEngine; #pragma warning disable IDE1006 namespace UNKO.Utils { - public abstract class SingletonComponentBase : MonoBehaviour + public abstract class SingletonComponentBase : MonoBehaviour, IDisposable where T : SingletonComponentBase { public static T instance @@ -18,6 +19,12 @@ public static T instance if (_instance == null) { _instance = FindObjectOfType(); + if (_instance == null) + { + GameObject newObject = new GameObject(typeof(T).Name); + _instance = newObject.AddComponent(); + } + if (_isInitSingleton == false) { _instance.InitSingleton(); @@ -40,6 +47,16 @@ protected virtual void Awake() } } + public static T GetOrCreateInstance() + { + return instance; + } + + public static void DestroySingleton() + { + _instance?.Dispose(); + } + public virtual void InitSingleton() { _isInitSingleton = true; @@ -49,6 +66,16 @@ private void OnApplicationQuit() { _isQuitApp = true; } + + public void Dispose() + { + if ((this is null) == false) + { + Destroy(gameObject); + } + _instance = null; + _isInitSingleton = false; + } } } #pragma warning restore IDE1006 diff --git a/Packages/unity-utils/Runtime/SingletonSOBase.cs b/Packages/unity-utils/Runtime/SingletonSOBase.cs new file mode 100644 index 0000000..03acc92 --- /dev/null +++ b/Packages/unity-utils/Runtime/SingletonSOBase.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +namespace UNKO.Utils +{ + public abstract class SingletonSOBase : ScriptableObject + where T : SingletonSOBase + { + public static T instance + { + get + { + if (_instance == null) + { + _instance = Resources.Load(""); + if (_instance == null) + { + Debug.LogError($"{nameof(T)} instance is null"); + } + } + + return _instance; + } + } + + private static T _instance { get; set; } + } +} \ No newline at end of file diff --git a/Packages/unity-utils/Runtime/SingletonSOBase.cs.meta b/Packages/unity-utils/Runtime/SingletonSOBase.cs.meta new file mode 100644 index 0000000..f409fc3 --- /dev/null +++ b/Packages/unity-utils/Runtime/SingletonSOBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 91e4202170e20c94b9171f8ec8655e08 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs index 9a370a3..546c66d 100644 --- a/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs +++ b/Packages/unity-utils/Runtime/SpriteAnimation/SpriteAnimation.cs @@ -34,9 +34,12 @@ public enum UpdateMode bool _isPlayOnEnable = false; [SerializeField] bool _isLoop = true; + [SerializeField] + bool _isDeactivate_WhenFinish = false; // NOTE unity event는 보통 인스펙터 최하단에 있기 때문에 여기에 배치 public UnityEvent OnStartAnimation = new UnityEvent(); + public UnityEvent OnChangeSpriteIndex = new UnityEvent(); public UnityEvent OnFinishAnimation = new UnityEvent(); public bool IsPlaying { get; private set; } @@ -117,6 +120,7 @@ public void SetAnimatedSprite(params Sprite[] sprites) public void SetIsLoop(bool isLoop) => _isLoop = isLoop; public void SetPlayOnEnable(bool enable) => _isPlayOnEnable = enable; public void SetUpdateMode(UpdateMode updateMode) => _updateMode = updateMode; + public void SetDeactivate_WhenFinish(bool deactivate) => _isDeactivate_WhenFinish = deactivate; private void OnEnable() { @@ -149,13 +153,19 @@ IEnumerator PlayCoroutine(System.Func getYield) OnStartAnimation.Invoke(this); while (spriteIndex < spriteCount) { - UpdateRenderer(_animatedSprites[spriteIndex++]); + OnChangeSpriteIndex.Invoke(spriteIndex); + UpdateRenderer(_animatedSprites[spriteIndex]); yield return getYield(waitSecondsPerFrame); + spriteIndex++; } OnFinishAnimation.Invoke(this); } while (IsLoop); IsPlaying = false; + if (_isDeactivate_WhenFinish) + { + // gameObject.SetActive(false); + } } private void UpdateRenderer(Sprite sprite) diff --git a/Packages/unity-utils/Runtime/StateMachineGeneric.cs b/Packages/unity-utils/Runtime/StateMachineGeneric.cs index eea95e5..1e0a185 100644 --- a/Packages/unity-utils/Runtime/StateMachineGeneric.cs +++ b/Packages/unity-utils/Runtime/StateMachineGeneric.cs @@ -144,12 +144,12 @@ public void EnqueueToWaitQueue(params STATE_ID[] nextStates) { Debug.LogWarning($"{_owner.name} _waitQueue.Count > 10, wait:{_waitQueue.ToStringCollection()}", _owner); } - nextStates.Foreach(state => _waitQueue.Add(state)); + nextStates.ForEach(state => _waitQueue.Add(state)); } public StateMachineGeneric ForEachState(System.Action OnEach) { - _stateInstance.Values.Foreach(OnEach); + _stateInstance.Values.ForEach(OnEach); return this; } diff --git a/Packages/unity-utils/Runtime/UnityComponentPool.cs b/Packages/unity-utils/Runtime/UnityComponentPool.cs index 1c7cd38..d929b0c 100644 --- a/Packages/unity-utils/Runtime/UnityComponentPool.cs +++ b/Packages/unity-utils/Runtime/UnityComponentPool.cs @@ -63,6 +63,11 @@ protected override void OnDespawn(TComponent despawnTarget) { base.OnDespawn(despawnTarget); + if (despawnTarget == null) + { + return; + } + GameObject despawnObject = despawnTarget.gameObject; if (despawnObject.activeInHierarchy) { diff --git a/Packages/unity-utils/Tests/Runtime/CollectionExtensionTests.cs b/Packages/unity-utils/Tests/Runtime/CollectionExtensionTests.cs index 02be0c6..802e084 100644 --- a/Packages/unity-utils/Tests/Runtime/CollectionExtensionTests.cs +++ b/Packages/unity-utils/Tests/Runtime/CollectionExtensionTests.cs @@ -22,7 +22,7 @@ public void ToStringCollectionExample() public void ForeachExample() { int[] originArray = new[] { 1, 2, 3, 4, 5 }; - originArray.Foreach(number => Debug.Log(number)); + originArray.ForEach(number => Debug.Log(number)); } [Test] diff --git a/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs b/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs index b4121ed..e3c14a2 100644 --- a/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs +++ b/Packages/unity-utils/Tests/Runtime/RandomExtensionTests.cs @@ -90,6 +90,6 @@ public void Shuffle() { List numbers = new List { 1, 2, 3, 4, 5 }; numbers.Shuffle(); - numbers.Foreach(item => Debug.Log(item)); + CollectionExtension.ForEach(numbers, item => Debug.Log(item)); } } From c65a089c1bca4cc8341d58a3109d888399b1eb77 Mon Sep 17 00:00:00 2001 From: KorStrix Date: Mon, 20 Dec 2021 12:10:22 +0000 Subject: [PATCH 75/75] Update file(s) "/." from "unity-korea-community/unity-utils" --- Packages/unity-utils/Runtime/SingletonComponentBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/unity-utils/Runtime/SingletonComponentBase.cs b/Packages/unity-utils/Runtime/SingletonComponentBase.cs index b095e1c..2e48534 100644 --- a/Packages/unity-utils/Runtime/SingletonComponentBase.cs +++ b/Packages/unity-utils/Runtime/SingletonComponentBase.cs @@ -69,7 +69,7 @@ private void OnApplicationQuit() public void Dispose() { - if ((this is null) == false) + if ((this is null) == false && (gameObject is null) == false) { Destroy(gameObject); }