diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 7137cfd5a..dac595267 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -1269,11 +1269,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -1379,11 +1379,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -2083,11 +2083,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -3251,7 +3251,6 @@ MonoBehaviour: card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - _upgradePopup: {fileID: 454484352} --- !u!1 &194818728 GameObject: m_ObjectHideFlags: 0 @@ -3410,11 +3409,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4240,11 +4239,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -160 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -5759,11 +5758,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -6075,11 +6074,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -6556,11 +6555,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -160 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -7154,11 +7153,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7275,11 +7274,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7963,11 +7962,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -9484,11 +9483,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -10238,11 +10237,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -290 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -10340,11 +10339,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -12861,11 +12860,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -13154,11 +13153,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -17617,11 +17616,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -18919,11 +18918,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -22215,11 +22214,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -22825,8 +22824,8 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2} _mushroomObject: {fileID: 9017181398980009727, guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8, type: 3} - PlayerServingCount: 0 - PlayerCleaningCount: 0 + _normalRewardBoxObject: {fileID: 5271591928794914848, guid: c939d59e0cc02ec45b0610f6b470031f, type: 3} + _rareRewardBoxObject: {fileID: 5271591928794914848, guid: 6609b1f764f239e4a94f6f88be3d4916, type: 3} --- !u!114 &1665075873 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23455,11 +23454,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -24398,7 +24397,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIezKglMquAIAAPcFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56WC0tKyt12g7R7aotJVD0sPTjwhFsaO/FGgFf99ZxxDApUiJZo3H2/ezOSLSe0qyL2x91aKRyOA/eww+mY/Og34AFu+NHouP+Hg8yaFL8mJR58X7qVBe5/CnFmDtzL/pZeKnHtoDFoWxq6nYglj47xDc8GVA4Ss8RSt0fTVYdsUsEvvT3p39viVg/Zgv3t1exf95NgdXVxH36BzxdcVCOLchPQRT1E30U9jO8mlzpIbpaRLbJjfVbHbMa9cwF7QQUiO3UUe5F+CXJY+hl+3w5+LwoFPLC3fTaRFmeq87LeptVtzt6rJfXAVqNLg9iryqtM+fsOHNVxYs344VO73qIYvZb564bucO98St22enFIPesPVimcK3krQT+bemqAFgt4GCg0OLietVMfexiXkq8av5npmDNX3QfWbce5j99u5h+qhUfCqsf514ObKRPlTSkKSZUQpweLw/mA/cXtcKoRW4ojxr3zZXrME3EnrPEKJT7KS7wwnBAJ0Dkn3LjloopeZYCkXm0auJEbwY2M1RHMiWIHmyu9mmNGfr8AZ1uJ1htxxurjELmGHQzoLiebGv9c7g2Zmcxy2xfV1cacPX//eaQiuNJtHcOVz8ErqltoEPKHAY6N1vbltMQ9h82ALnrfCPGx9sDDhnsdqSAcXTLRDUcsYoYNStMuxgcgIG6DnnfQtOdZV0cyejI63d/KO9JdBitMLYT1+w0ciK64v+9nw5jbrDrIBZDkMst5QwHDUZ/GEpEa5uZrVeiWVcLt004vGc6GML+A8D5brOHlh+eZefq5Na/JSF2aeWwD9XGc4NgsWi+APRkyFxDbn4L3UcS/Z14Ipk69ALI6JFlHY6dZbvmiyLFglP4wny4KN419wwch8vEhc3Q8JGyp+kgwUjg7Eq1Sw5hVBvT3b/wdQSwMEFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPUM9RRUEovSizIKAYKgDmlmSkgdrSSQaJ5omVKUpqpkWGSmblFkq5xknFqUnKqcZKBWUqqmaWhUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAABIIezKglMquAIAAPcFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAAAAAAAAAAAAAAAUDAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAuwMAAAAA + dataString: UEsDBBQAAAgIAABIIewzg0WLvAIAAPkFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wWFUmjZ2y7Qdg9tUemqh00PTjwhFo4d+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhtwqfa85e1QMyM8e8d/kR691PsCOrpVc8U84Yt44s6UH0YB5oZYrtA99mFEVWM3zX3ItPDhBo5O8ULpasDXMlLEGzQUVBtCllfXREk1fPbKLAfv4/vTv3gG/cpAW9HdUPxkMI7A/HdwGrJO5oFUNzHNuQ4bTwThGjQfjgJTYUAQ1eXIlBDeRD7H7OvQ7o7Vx2A0CGKfYX2Di8SXwdWlD+Lgb/lwUBmzkqel+zjUK1eQlv1WjXkXNpqH3QYXzlUa314FXk/bxm3/SuAutqodj5WHia9iS55sXus+psR15u+b5OXUnt1RsaCbgrQT5pO61cpKh02rnQ52Bq3kn1am3WQn5psU1XC+Mrv4+qmE70EPofreyUD+0Cl631r8GzEqoIH9M6T3RMvUpQePw/mA/YX9MLIRWzxHjX+m6u2jRcce1seiKfKLVY5c4IWAgc4i69z1AenqZctrnIovA1Yvh7ExpCcEcCdYgqbD7JWa0lytw4evwuvDcUX9zkV30HU/pIiSYW3ySXLiWansatsb1NWGnj1//3v0QTKm2j2DKZ2cFlx21veMJBZ4pKZvN7Yp5DFs5XdC8E2ZhZ52GObU0VEM6uGCsG4pahgjphPC7HBoIjLAB/7x7fUuKdUUwkyclw+2dvQP9tePs/EJIQm/olGXF+GqYTW5us/4oG0GWwyhLJgwm0yEJJ8Qlyk3FstErqoTbJdteJJ6Lz/gCxlKnqQyTZ5pu7/lnpTqT57JQq1wDyOcmw6lZ0FgEfzBswTi2uQJruQx7Sb5SIlS+AZaeEqVB2MXOapq2WVJS8w9lvSUls/AfTIk3ny4SV/eDw9YXP0sGAkcH7JULqGjtXcmBHP4DUEsDBBQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPUUVBKL0osyCgGCoA5pZkpIHa0kkGieaJlSlKaqZFhkpm5RZKucZJxalJyqnGSgVlKqpmloVIsUH1JZUGqX2JuKkRPQGJJRlpmXkpmXrqee1FmijvIaKXYWgBQSwECLQAUAAAICAAASCHsM4NFi7wCAAD5BQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAAAAAAAAAAAAAAAJAwAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAACAAIAuAAAAL8DAAAAAA== file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -25727,11 +25726,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -290 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -27403,11 +27402,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index c9a5b4bc1..6118bc12d 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -172,7 +172,7 @@ namespace BlueWater.Players.Tycoons { var percent = 0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; var saveGold = (int)(TycoonManager.Instance.TycoonStatus.CurrentGold * percent); - ES3.Save("Gold", saveGold); + ES3.Save("EndGold", saveGold); } public void MakeCocktailCompleted(CocktailData cocktailData, bool isMadePlayer) diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index e15fe1a0b..413351b7a 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -109,14 +109,6 @@ namespace BlueWater OnLevelUp?.Invoke(levelData); } - // 플레이어 - // 레벨업 업그레이드 ui 표시 이벤트 - public static Action OnUpgradeUi; - public static void InvokeUpgradeUi(LevelData levelData) - { - OnUpgradeUi?.Invoke(levelData); - } - // 경험치 변경 이벤트 public static Action OnChangeExp; public static void InvokeChangeExp(int addedExp) @@ -299,6 +291,20 @@ namespace BlueWater OnChangedRandomCocktail?.Invoke(changedCocktailData); } + // 일반 보물상자 오픈 이벤트 + public static Action OnOpenedNormalRewardBox; + public static void InvokeOpenedNormalRewardBox() + { + OnOpenedNormalRewardBox?.Invoke(); + } + + // 레어 보물상자 오픈 이벤트 + public static Action OnOpenedRareRewardBox; + public static void InvokeOpenedRareRewardBox() + { + OnOpenedRareRewardBox?.Invoke(); + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 7e97a4f70..5163b6476 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -82,7 +82,8 @@ namespace BlueWater.Tycoons { if (IsShowing) { - EventManager.InvokeHoldInteracting(HoldingElapsedTime); + var holdingGauge = Mathf.Clamp(HoldingElapsedTime / _playerHoldingTime, 0f, 1f); + EventManager.InvokeHoldInteracting(holdingGauge); } if (IsMoldy) diff --git a/Assets/02.Scripts/Prop/Tycoon/Pump.cs b/Assets/02.Scripts/Prop/Tycoon/Pump.cs index 7652688fe..406df118e 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Pump.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Pump.cs @@ -8,7 +8,7 @@ namespace BlueWater.Tycoons public class Pump : InteractionFurniture { [SerializeField] - private float _interactionHoldingTime = 1f; + private float _playerHoldingTime = 1f; [SerializeField] private PumpingMessage _pumpingMessageObject; @@ -23,20 +23,15 @@ namespace BlueWater.Tycoons private void Update() { - var holdingGauge = 0f; - if (HoldingElapsedTime > 0f) - { - holdingGauge = Mathf.Clamp(HoldingElapsedTime / _interactionHoldingTime, 0f, 1f); - } - if (IsShowing) { + var holdingGauge = Mathf.Clamp(HoldingElapsedTime / _playerHoldingTime, 0f, 1f); EventManager.InvokeHoldInteracting(holdingGauge); } - if (HoldingElapsedTime > _interactionHoldingTime) + if (HoldingElapsedTime > _playerHoldingTime) { - HoldingElapsedTime -= _interactionHoldingTime; + HoldingElapsedTime -= _playerHoldingTime; EventManager.InvokeAddBarrels(addedLiquid); var pumpingMessage = Instantiate(_pumpingMessageObject, transform.position + _offset, diff --git a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs new file mode 100644 index 000000000..cbc7146d7 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + [Serializable] + public class RewardBox : InteractionFurniture + { + [SerializeField] + private AnimationController _animationController; + + private RewardBoxType _rewardBoxType; + private bool _isInteracting; + + public void Initialize(RewardBoxType rewardBoxType) + { + _rewardBoxType = rewardBoxType; + InteractionCanvas.BalloonUi.ShowUi(); + } + + public override void Interaction() + { + if (_isInteracting) return; + + StartCoroutine(nameof(OpenRewardBoxCoroutine)); + } + + public override void CancelInteraction() + { + + } + + private IEnumerator OpenRewardBoxCoroutine() + { + _isInteracting = true; + _animationController.SetAnimationParameter("isOpened", true); + + yield return new WaitUntil(() => _animationController.GetCurrentAnimationNormalizedTime() >= 1f); + + switch (_rewardBoxType) + { + case RewardBoxType.Normal: + EventManager.InvokeOpenedNormalRewardBox(); + break; + case RewardBoxType.Rare: + EventManager.InvokeOpenedRareRewardBox(); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs.meta b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs.meta new file mode 100644 index 000000000..b3aa460e5 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8021ced03819a5246a43bc5abf940918 diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index 99bf567f9..74329b3ac 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -192,7 +192,7 @@ namespace BlueWater.Tycoons _currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); Food.sprite = _emptyBeerGlass; Food.enabled = true; - InteractionCanvas.BalloonUi.OrderItem(_emptyBeerGlass, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); + InteractionCanvas.BalloonUi.OrderItem(DataManager.Instance.SpriteDataSo.Cleaning, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); IsCleaned = false; var crewController = TycoonManager.Instance.CrewController; diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index 3dbfdfb36..bc2cc591a 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -24,7 +24,6 @@ namespace BlueWater.Tycoons private float _crewHoldingTime = 9f; private LevelData _currentLevelData; - private Sprite _vomitingImage; private Coroutine _findCleanerCrewInstance; private bool _isPlayerInteracting; private bool _isCrewInteracting; @@ -100,8 +99,7 @@ namespace BlueWater.Tycoons public void Initialize() { - _vomitingImage = VisualLook.GetComponent().sprite; - InteractionCanvas.BalloonUi.OrderItem(_vomitingImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); + InteractionCanvas.BalloonUi.OrderItem(DataManager.Instance.SpriteDataSo.Cleaning, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); var crewController = TycoonManager.Instance.CrewController; Utils.StartUniqueCoroutine(this, ref _findCleanerCrewInstance, crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.CleanerCrews, crew => crew.OnMission(this))); diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index 112aa150d..ffbae7458 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -25,5 +25,8 @@ namespace BlueWater [field: SerializeField] public Sprite Waiting { get; private set; } + + [field: SerializeField] + public Sprite Cleaning { get; private set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 7cbd8e98a..3df5e84dd 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -15,17 +15,24 @@ namespace BlueWater.Tycoons [SerializeField] private Mushroom _mushroomObject; + + [SerializeField] + private RewardBox _normalRewardBoxObject; + + [SerializeField] + private RewardBox _rareRewardBoxObject; public Dictionary InstanceCocktailDatas { get; private set; } = new(); - - public static int VomitCount; - public int PlayerServingCount; - public int PlayerCleaningCount; + + private int _playerServingCount; + private int _playerCleaningCount; private bool _isClosedTime; private TycoonManager _tycoonManager; private Coroutine _startStageCoroutineInstance; private TimeSpan _closedTime; + + public static int VomitCount; private void Awake() { @@ -34,6 +41,7 @@ namespace BlueWater.Tycoons EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail; EventManager.OnCocktailDiscarded += RemoveInstanceCocktail; EventManager.OnCreateMushroom += CreateMushroom; + EventManager.OnLevelUp += CreateChest; } private void Start() @@ -41,8 +49,8 @@ namespace BlueWater.Tycoons _tycoonManager = TycoonManager.Instance; VomitCount = 0; - PlayerServingCount = 0; - PlayerCleaningCount = 0; + _playerServingCount = 0; + _playerCleaningCount = 0; } private void OnDestroy() @@ -52,6 +60,7 @@ namespace BlueWater.Tycoons EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail; EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail; EventManager.OnCreateMushroom -= CreateMushroom; + EventManager.OnLevelUp -= CreateChest; } private void StartStage() @@ -125,24 +134,41 @@ namespace BlueWater.Tycoons var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation); mushroom.Initialize(); } + + public void CreateChest(LevelData levelData) + { + if (levelData.Idx == "1") return; + + var spawnPosition = Utils.RandomPositionOnGraph(); + + var rewardBox = levelData.RewardBoxType switch + { + RewardBoxType.Normal => _normalRewardBoxObject, + RewardBoxType.Rare => _rareRewardBoxObject, + _ => throw new ArgumentOutOfRangeException() + }; + + var instance = Instantiate(rewardBox, spawnPosition, rewardBox.transform.rotation); + instance.Initialize(levelData.RewardBoxType); + } public void ServingBonus() { - PlayerServingCount++; + _playerServingCount++; - if (PlayerServingCount < StageDataSo.ServingBonusCount) return; + if (_playerServingCount < StageDataSo.ServingBonusCount) return; - PlayerServingCount = 0; + _playerServingCount = 0; TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth++; } public void CleaningBonus() { - PlayerCleaningCount++; + _playerCleaningCount++; - if (PlayerCleaningCount < StageDataSo.CleaningBonusCount) return; + if (_playerCleaningCount < StageDataSo.CleaningBonusCount) return; - PlayerCleaningCount = 0; + _playerCleaningCount = 0; EventManager.InvokeCleaningBonus(StageDataSo.CleaningBonusMakingSpeedUpTime, StageDataSo.CleaningBonusMakingSpeedMultiply); } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 8175673f0..1ff9d2965 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -30,14 +30,11 @@ namespace BlueWater.Uis private TycoonManager _tycoonManager; private TycoonStatus _tycoonStatus; - [field: SerializeField, CLabel("업그레이드_스크립트")] - private GameObject _upgradePopup; - private bool _isSelectedPassive; private void Awake() { - EventManager.OnLevelUp += CreateCardEvent; + EventManager.OnOpenedNormalRewardBox += CreateCard; _panel = transform.Find("Panel").gameObject; HideUi(); @@ -52,7 +49,7 @@ namespace BlueWater.Uis private void OnDestroy() { - EventManager.OnLevelUp -= CreateCardEvent; + EventManager.OnOpenedNormalRewardBox -= CreateCard; } public override void Open() @@ -179,14 +176,6 @@ namespace BlueWater.Uis _tycoonCard03Componet.Rotation_Start(); } - private void CreateCardEvent(LevelData levelData) - { - _lvData = levelData; - if (_lvData.Idx == "1") return; - - CreateCard(); - } - public void SelectedCard(TycoonCard currTycoonCard) { switch (currTycoonCard.CardDataForIdx.Idx) //탐색 후 행동... @@ -400,11 +389,6 @@ namespace BlueWater.Uis { Destroy(_currentCard03); } - - if (int.Parse(_lvData.Idx) % 5 == 0) - { - EventManager.InvokeUpgradeUi(_lvData); - } Close(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs index 1cdb54137..2a0152c7b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs @@ -22,12 +22,12 @@ public class Upgrade_Popup : PopupUi private void Start() { - EventManager.OnUpgradeUi += StartUpgradePopup; + EventManager.OnLevelUp += StartUpgradePopup; } private void OnDestroy() { - EventManager.OnUpgradeUi -= StartUpgradePopup; + EventManager.OnLevelUp -= StartUpgradePopup; } public override void Open() @@ -53,17 +53,19 @@ public class Upgrade_Popup : PopupUi private void StartUpgradePopup(LevelData currentLevelData) { - switch (int.Parse(currentLevelData.Idx)) - { - case 5:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidB").Sprite; break; - case 10:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidC").Sprite; break; - case 15:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidD").Sprite; break; - case 20:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidE").Sprite; break; - case 25:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish1").Sprite; break; - case 30:liqueurImage.sprite = ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish2").Sprite; break; - } - + if (string.IsNullOrEmpty(currentLevelData.OpenUpgrade)) return; + liqueurImage.sprite = int.Parse(currentLevelData.Idx) switch + { + 5 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidB").Sprite, + 10 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidC").Sprite, + 15 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidD").Sprite, + 20 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidE").Sprite, + 25 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish1").Sprite, + 30 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish2").Sprite, + _ => liqueurImage.sprite + }; + StartCoroutine(StartUpgradePopupCoroutine(currentLevelData)); } diff --git a/Assets/03.Images/Props/Furniture/NormalRewardBox.png b/Assets/03.Images/Props/Furniture/NormalRewardBox.png new file mode 100644 index 000000000..1ac1f91d6 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/NormalRewardBox.png differ diff --git a/Assets/03.Images/Props/Furniture/NormalRewardBox.png.meta b/Assets/03.Images/Props/Furniture/NormalRewardBox.png.meta new file mode 100644 index 000000000..2a62fdc80 --- /dev/null +++ b/Assets/03.Images/Props/Furniture/NormalRewardBox.png.meta @@ -0,0 +1,235 @@ +fileFormatVersion: 2 +guid: ac7a8fcc13da6734aa150a85cd6a31b1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: NormalChest_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e6e77d4e1f13dfe42bdd60ec1709a0c8 + internalID: -625739132 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NormalChest_1 + rect: + serializedVersion: 2 + x: 1024 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2e94d230620bab74e8888b79c5cc953e + internalID: 1033282022 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NormalChest_2 + rect: + serializedVersion: 2 + x: 2048 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6355339940552a74e889807fec789ff5 + internalID: -1227522046 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NormalChest_3 + rect: + serializedVersion: 2 + x: 3072 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d63560c9a1329f645a1539cfce8ef69a + internalID: 1834614342 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: b884203274a3d5142a05e26c5683da32 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + NormalChest_0: -625739132 + NormalChest_1: 1033282022 + NormalChest_2: -1227522046 + NormalChest_3: 1834614342 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Furniture/RareRewardBox.png b/Assets/03.Images/Props/Furniture/RareRewardBox.png new file mode 100644 index 000000000..16174e229 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/RareRewardBox.png differ diff --git a/Assets/03.Images/Props/Furniture/RareRewardBox.png.meta b/Assets/03.Images/Props/Furniture/RareRewardBox.png.meta new file mode 100644 index 000000000..3db563db6 --- /dev/null +++ b/Assets/03.Images/Props/Furniture/RareRewardBox.png.meta @@ -0,0 +1,235 @@ +fileFormatVersion: 2 +guid: be937cadfd3eee548b633fade0316615 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: RareChest_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 66499bc6ad5db7948bfd9a32f87c7ea3 + internalID: -554295133 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: RareChest_1 + rect: + serializedVersion: 2 + x: 1024 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 45383f1f9e01aac47b835038981b7611 + internalID: 1203015535 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: RareChest_2 + rect: + serializedVersion: 2 + x: 2048 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 694c0035140d7064a9c0e210a203bb1e + internalID: 1082762783 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: RareChest_3 + rect: + serializedVersion: 2 + x: 3072 + y: 0 + width: 1024 + height: 1024 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 28ad0e09bcba6af4794418b111b92306 + internalID: -2004123757 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: edd69cff65309b745aeb273b91ae7ca6 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + RareChest_0: -554295133 + RareChest_1: 1203015535 + RareChest_2: 1082762783 + RareChest_3: -2004123757 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Cleaning.png b/Assets/03.Images/Ui/Tycoon/Cleaning.png new file mode 100644 index 000000000..4f961aa9c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Cleaning.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Cleaning.png.meta b/Assets/03.Images/Ui/Tycoon/Cleaning.png.meta new file mode 100644 index 000000000..4e91712f6 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Cleaning.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 136371c47f578f3449b773f6a639de3a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab new file mode 100644 index 000000000..45a323563 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab @@ -0,0 +1,315 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: NormalRewardBox + objectReference: {fileID: 0} + - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.g + value: 0.026785713 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillMethod + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillOrigin + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5271591928794914848} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 4960744589634642266} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9176172352370892430} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7336282779599763463} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7336282779599763463 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c31e1b3611850114e878a94df414b8d9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5271591928794914848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8021ced03819a5246a43bc5abf940918, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 9176172352370892430} + k__BackingField: 1 + k__BackingField: 0.5 + k__BackingField: + IsOpened: 0 + _animationController: {fileID: 4960744589634642266} +--- !u!114 &4960744589634642266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: + _animator: {fileID: 7336282779599763463} +--- !u!114 &9176172352370892430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 619165128654848 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5271591928794914848} + m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp + m_MethodName: set_InteractionMessage + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + references: + version: 2 + RefIds: [] +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab.meta new file mode 100644 index 000000000..3185524cb --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c939d59e0cc02ec45b0610f6b470031f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab new file mode 100644 index 000000000..7d166bbb7 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab @@ -0,0 +1,315 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: RareRewardBox + objectReference: {fileID: 0} + - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.g + value: 0.026785713 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillMethod + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_FillOrigin + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5271591928794914848} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 4960744589634642266} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9176172352370892430} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7336282779599763463} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7336282779599763463 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 637db86a8b0e03f4ba7b4d53bfaef043, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5271591928794914848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8021ced03819a5246a43bc5abf940918, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 9176172352370892430} + k__BackingField: 1 + k__BackingField: 0.5 + k__BackingField: + IsOpened: 0 + _animationController: {fileID: 4960744589634642266} +--- !u!114 &4960744589634642266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: + _animator: {fileID: 7336282779599763463} +--- !u!114 &9176172352370892430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 619165128654848 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5271591928794914848} + m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp + m_MethodName: set_InteractionMessage + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + references: + version: 2 + RefIds: [] +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab.meta new file mode 100644 index 000000000..a422cb1e3 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6609b1f764f239e4a94f6f88be3d4916 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab index 000d8ffd1..6170b7687 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab @@ -206,8 +206,9 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: {fileID: 5927803667513949971} k__BackingField: {fileID: 6077686033771388879} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 6533109861150454071} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: {fileID: 1488784826241318952} k__BackingField: 1 k__BackingField: 0.5 k__BackingField: @@ -266,3 +267,14 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} m_PrefabInstance: {fileID: 7343451337687172630} m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/07.Animations/RewardBox.meta b/Assets/07.Animations/RewardBox.meta new file mode 100644 index 000000000..58a74ccce --- /dev/null +++ b/Assets/07.Animations/RewardBox.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3be4ce7a86afdca469858ae370819388 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Normal.meta b/Assets/07.Animations/RewardBox/Normal.meta new file mode 100644 index 000000000..506658217 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63ddad20e6bae834db36bb7c97294fd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Normal/Idle.anim b/Assets/07.Animations/RewardBox/Normal/Idle.anim new file mode 100644 index 000000000..33ebd3f97 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/Idle.anim @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/RewardBox/Normal/Idle.anim.meta b/Assets/07.Animations/RewardBox/Normal/Idle.anim.meta new file mode 100644 index 000000000..2a32f89ed --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b59a23b1267c26943850f1300d8672dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller b/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller new file mode 100644 index 000000000..2b007ab02 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-7869229968154303586 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1426243990662898398} + m_Position: {x: 310, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7591782972982689825} + m_Position: {x: 310, y: 220, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1426243990662898398} +--- !u!1102 &-1426243990662898398 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 619443314128797843} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b59a23b1267c26943850f1300d8672dc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NormalRewardBox + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isOpened + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7869229968154303586} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &619443314128797843 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isOpened + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7591782972982689825} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7591782972982689825 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Open + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 61fd5ca56a523cb4bbef3bfbda7d2692, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller.meta b/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller.meta new file mode 100644 index 000000000..f4e310bce --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/NormalRewardBox.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c31e1b3611850114e878a94df414b8d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Normal/Open.anim b/Assets/07.Animations/RewardBox/Normal/Open.anim new file mode 100644 index 000000000..50f1e54f1 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/Open.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Open + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - time: 0.16666667 + value: {fileID: 1033282022, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - time: 0.33333334 + value: {fileID: -1227522046, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - time: 0.5 + value: {fileID: 1834614342, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -625739132, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - {fileID: 1033282022, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - {fileID: -1227522046, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + - {fileID: 1834614342, guid: ac7a8fcc13da6734aa150a85cd6a31b1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.51666665 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/RewardBox/Normal/Open.anim.meta b/Assets/07.Animations/RewardBox/Normal/Open.anim.meta new file mode 100644 index 000000000..07d0a734a --- /dev/null +++ b/Assets/07.Animations/RewardBox/Normal/Open.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61fd5ca56a523cb4bbef3bfbda7d2692 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Rare.meta b/Assets/07.Animations/RewardBox/Rare.meta new file mode 100644 index 000000000..ed73afca4 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03e5885e544dbfd4f9093e12dd431231 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Rare/Idle.anim b/Assets/07.Animations/RewardBox/Rare/Idle.anim new file mode 100644 index 000000000..be63129b9 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/Idle.anim @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/RewardBox/Rare/Idle.anim.meta b/Assets/07.Animations/RewardBox/Rare/Idle.anim.meta new file mode 100644 index 000000000..400009d7f --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 101fc9e06bcfd5449be6de2de0b474f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Rare/Open.anim b/Assets/07.Animations/RewardBox/Rare/Open.anim new file mode 100644 index 000000000..ae21377f3 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/Open.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Open + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + - time: 0.16666667 + value: {fileID: 1203015535, guid: be937cadfd3eee548b633fade0316615, type: 3} + - time: 0.33333334 + value: {fileID: 1082762783, guid: be937cadfd3eee548b633fade0316615, type: 3} + - time: 0.5 + value: {fileID: -2004123757, guid: be937cadfd3eee548b633fade0316615, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -554295133, guid: be937cadfd3eee548b633fade0316615, type: 3} + - {fileID: 1203015535, guid: be937cadfd3eee548b633fade0316615, type: 3} + - {fileID: 1082762783, guid: be937cadfd3eee548b633fade0316615, type: 3} + - {fileID: -2004123757, guid: be937cadfd3eee548b633fade0316615, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.51666665 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/RewardBox/Rare/Open.anim.meta b/Assets/07.Animations/RewardBox/Rare/Open.anim.meta new file mode 100644 index 000000000..008ecf3b8 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/Open.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62d4b3ec70cc3084f9b5244908a1a997 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller b/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller new file mode 100644 index 000000000..5dae9b6f5 --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8463433487428706251 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Open + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 62d4b3ec70cc3084f9b5244908a1a997, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RareRewardBox + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isOpened + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5870977786569126912} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &587812745997044405 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4748954202104708913} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 101fc9e06bcfd5449be6de2de0b474f8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4748954202104708913 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8463433487428706251} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &5870977786569126912 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 587812745997044405} + m_Position: {x: 340, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8463433487428706251} + m_Position: {x: 350, y: 210, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 587812745997044405} diff --git a/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller.meta b/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller.meta new file mode 100644 index 000000000..6a70d30fe --- /dev/null +++ b/Assets/07.Animations/RewardBox/Rare/RareRewardBox.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 637db86a8b0e03f4ba7b4d53bfaef043 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset index 166834654..101143fb9 100644 --- a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset +++ b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset @@ -219,6 +219,10 @@ MonoBehaviour: m_Key: InteractionMold m_Metadata: m_Items: [] + - m_Id: 619165128654848 + m_Key: InteractionRewordBox + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/13.Localization/Tables/StringDataTable_en.asset b/Assets/13.Localization/Tables/StringDataTable_en.asset index 2b258a4f4..310acdf1c 100644 --- a/Assets/13.Localization/Tables/StringDataTable_en.asset +++ b/Assets/13.Localization/Tables/StringDataTable_en.asset @@ -234,6 +234,10 @@ MonoBehaviour: m_Localized: Cleaning Mold m_Metadata: m_Items: [] + - m_Id: 619165128654848 + m_Localized: Open Reword Box + m_Metadata: + m_Items: [] references: version: 2 RefIds: diff --git a/Assets/13.Localization/Tables/StringDataTable_ko.asset b/Assets/13.Localization/Tables/StringDataTable_ko.asset index f0c445583..12daf062f 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ko.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ko.asset @@ -247,6 +247,10 @@ MonoBehaviour: m_Localized: "\uACF0\uD321\uC774 \uCE58\uC6B0\uAE30" m_Metadata: m_Items: [] + - m_Id: 619165128654848 + m_Localized: "\uC0C1\uC790 \uC5F4\uAE30" + m_Metadata: + m_Items: [] references: version: 2 RefIds: