diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 4e8ad7e8..5da40807 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -sSWyGJvMwKyrXPGa+UcR7ijwM+qeMX15w5gLe+ThVpwdHKCThwekRwehV+QJtIy+ \ No newline at end of file +LqzefEWOl7H56PREiEe6yHXVsWi1rP2xEXLtQnk4QSVaXJB6jqQqJ4eRIzADDaN5 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt index 55cb66bf..9448a1b0 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt @@ -1 +1 @@ -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 \ No newline at end of file +Zk+B8NlKjHjtk+hnAppVbdilebzJsEzjf7gziMonA6N18F2yVlGwk+KvxnrC8moi2vqsOlDaIFuYCxrkxNXu+6Qdfb6C1wnfBGSgwwImeXWtTv93ciokVYhrOl32OiPdDqwdOt6Vv+QgmJcGWDeae97OK3vlcQmzGU6vRYJd2Vv3Bfz5ikbPKXQZjnbFqQuXXckVZfDakan5s16sx6oYAVtN/s+yEWkEn9MybERnxjjj4fCaugHGgp1L09vgFucU50ImuaRFO9vI1C8ZAEhEKyL4eVQm/ubYfCLfuT/cuFzr1RayKa1yTA6J8UiA6b3PLhc2K5+MdYFDXJ4H889Gh9/qLQj4iGUiUb8jC8r/07YKxJB0SfQnEmo3m2lZTaDWdwUTBUHhT8igDu3aXlULnOTeh65isx67JZv3E+iIeF32f8DTTKrt33PdlQ0xoOsYfDUBLLo0zEVAB+IEhv6cQ1FKrHo/yz4FHe/OfWC5zi7SxsNt4cIzj61ydvhHhvMBbc2IPVBtdXUufqISePwEZN24OkcIXJbDlNg8MH+NRRH47zmRfk5zCCSzaoK9F3xwjeiTwWjmSrfeZ+2QZztxwZ7x862uXmwS8rCrG/+C+JgJ/42CB7qKr0qSpnXtTPaBUwrLHZqj/s3NNpz8Bjy/tEWFNFIrHGp2z+QwKcxnhvjdtg+6Zo+1nirb0UiGa+YY64fag37JELLRgKCpq+nDmCRjWxA0mz96RekxANP8loPu4LRipceFjvLaCc3MqDLT1JjFdRwz1QG/fP7HMZtCAeGnFOyrmyi/QjEscS+ZN5LdRFWTP2FP0i5bJnOagdK7RMU4kno8SM+c8fu6oPdcI0K696WtzUEbVcmlktIm9xc/Asxqk/I52ZJiKyzGhAIECnoNeZS9FZVzAYU/MSyN5oO9UowBl6ch7m//8i2KP9GLKiv6a4nrMXlW0byDVOj6L9xY00FRfZX9iOf6sSiH+WehTQgXToI0UxeiVmC9Er3Pt21j4wwbCWUSzl0DftnCuwVu8GtqsKe0NeL60rMtXyVcz89/WjB1Pk1+abJEG7m7o7K0b/uwxqH1wn7/Xs3epchkdvLpjCQOSIVfbQmnLPF7nKIcheau3qG+5Z8uXJP1ZsDhPDCOj3iwkQpbzssIrJ2mzQd8mk2g7aX9EQsEiXX33H7wcG19m4ymIB07w48D1d6U7IlKN3cWNhAZfi0EeY2LFYAzwQj1o9MF3v5gFgQoj6GokPAG4m2MenbtyacXqzJ2iCU0QZbmlrTx37niLcQwkuojNj7k7thCCZQmb31Z7sfAloV1HCTUR09Cu+0RwW12RHQIEN8/Pvqo06HROkq2Oa/Zj/vLpUVT3cJudjy25DojUAFdNl3Qxhv2EleDz6ubRp2hHhzA9Uirb5A91NDnQpjEY9lv1UnHFuYTOqTk/+vyxla0QD6uU2aHuJ0+obd2EVqtsoGNLo2SRsO1TKUV4n0LeA+YQQz0KcKHr7bqmz9ESDUC6cZz9agPPp61UOoF6c85mi2dAhxewE8BbMdnzzRX5zLET8ht51HSe3O3ww3WGNoge4Quy+7wyNk6WrX3Lhjiuo7msaTXRnvuJQS4JTOs1bz/v8lmcqU3/SUfBCQ8nu/+4iJok7yLNdQ0a9apMH97Nc5at015RrkZgxAVz11kWrY2U8blWD2zcmLCLJ+R3N5QQV/Hq5ORnecIEVj4QIn5bk+5IYhC1M/kYTVXtcwKcM1wNwATJdgpdqcN+OeuSrrwj6v4I9Qpjbj89yZuj8QhPcB6KUgQdB+3ioZ6Gp4aCNcV+QCzNNoQmJjxAcDt5AznfGRdMElRUR8puNxwvCo5R9mQm4bpfYGHy41ou78wpZv0r5EXasqSHtQmBKu1R7F7CBKH7Tuo/k6aB6kaUde+Uu/fuXPwDB5iVRyOXsaiVFZF0IdOPaNM46zTZ9smbAL1uPi/JjmRUgYSYQla61akoD7TNpHND+OHTgLyYK0H7Txl5imfE5t4WGjU7wUf4We84BZNQLs3cD5C61nA0poC9pN38qfb4n2ZfeybdfhYTBMEG5wIFcT90z0cVtcdV3FIEsCJFRk93axTmUfatVQCvLCq6EmZPzC6qr7cCCBAATvQQQE6uy+xLKJfN/aempLsUZF8YmRXxmrgjf4sGDdAODXl6pd2VWPVWVlFbw7tTutYswRGzcfOcmkKA/uqMXHa1ATdWn+6AnBgM7VuoE78REZ7EVfrVaAjOM5g8uGnf2lRuWmVgOnmx4jjXukwLwTuH6NHvKs7yNeNEjwKOfI0Z+7+FLZwrznJEYLu+FtAAdwYRzjDY94KRG6x8KtV/Wxsmu+bUFMtX/hxNW5QKrfT29zLKyGF/JV5CHMK1QHbh6GNWLhx1ROh22WPFIlqpq1639UzDbLw6rFq6yVskKfQpAOkwZFaUmh7C24JkPjx5nuB3XP0x0fXTvQo0vKJE2CatDYlPEd1xLxQE+7lbFXOUqsYvcjaCquYBuqpwF8h3MFQ/EyYr9uYmWqJH9fPRQDiEj3L6G8rRHHMILinjcsZsZKjzNK2N8V3C2JUgMzGlWei77WroL3v2LKgwRiJzQTQicNfrcM3MSC7NXzc/f0OjpeB/kYt6v1JWDkHqVeNtfGto0j1lNTwuIWpjZSHC8wmmmXKfBuGDFJAY88RiCUvvyJoxT9bNJP9j5KzsWzvlfXvXDYEvY5ZwHxfr3P0S0GZY6uQyeS4Lz3D5HmvqQyPdA/WN87Ipqj0DrAQko5yztn2SmZmV8XFkCl54frnBcxhdkoi6jSIzBA87/Q6iT9nQ7bu401fe1DvBxQ3gLQ/PRdfEQvEuFrzphG/32svy35ulR7m54TNoQ/dxmc+ZZvsxTQXk0t7MD+UDQL1YdmzXaLYOi2Sz2OAUzQ0mIVyBJYYnowqjIciX/ZCBoLFWC9GYh+veZDF4vTT1QQoIlz4jEbKTtfK6BIGXw7eAE4iF9qPaq9pbSamYjdmz+rbwOD/3Y6NGVNaoulf2pRrlszlRIeVdrPvKNKblXuLmbTc01JzMgOOk8ZT3VVsKmWNNA+ujGZP2yjngtyfHurOyxyZw2XaeClkd9zv/n0ems2OCOevdscb4vFQ8qtags1U1gHjtsIbygaPcfctb7xkZOEvUR5CTFsvh+nIxqiwnQlalJ3GfDyTHqnSc+lI4Iq+ElkXkX3xepef5g/vtLWeiWiDcJ/A/DDpHY79QDp0FOJyTwZgjq6JtUaV4NhrDWghBN1HV089e65XVpRom67Xqa2lpH5GgHLT8M3KDJpsdXrd4yApTLPq7A2iJqHnICm+7bcoP7BxqoFTxL7Ij5HbZqdXoGDWo1+TEDsv+lvulIFDVfd3SZ2fIUP3wLYzWvnyjcdYpZtIGeOzClguMYi9KUezROeUsGTKUoVgTPMk4g7GsPAqSeQgH+Hw+ELsniDac1TK15i6UbOdaCAWYuhUu7KjDqvUd6au7LyTzgezC3k83mgYlVvhTF8vaClItIfT1j6W7OURCGsvzYcLhV67ftfZQ1DlfS8eh5Rt2LzGrtINvexzrjAf2/8twlZjWTvLmmiceBw6hHOkaRe87vNUOzC+dJqZDrpx5CZNgInMDj0dHOu0oszcROCEZg5TwT4JosgDi9PqGPAuNs22BtMlU479pdoWKlGNYDutD6g0SxszVgVqYVcmdHVIEEclkDbsYHRB3Tk4+ybAC7aYLEyrmKzrJbbg5vUdIuomsV6knFZxomfbC0M/PS1B3zVPmGjbNbMC79GHTc3ljydRTpoQcakgWEzEiginZXPpbaG0A/Drw3r1CFPiKOhqJ40KWa5OQA4Xtr+/azAXqSzx+xoHkTxherRdtaVm1bmBoaPRT/F62lpdHy9jiZXDa3yfEqkm8vGzsr3FfiYM730ERzeZhfzAAz/G8x0D4cOuG1SfGV3PZS9j+nCOY1jb5r31wU7bKCw+LANI5WhJkeUMtW1qYyjyHPF2djZgk3a17DS6dg0GRDkOLZ6xJKn5hl/BQOnNcomXPbnght3+0/n4qX+u9xjy97Fs6jaZahXjPrQQ+PBSNAqeRedGvFyhIXUev7q2+7VTiqM2nQ4zQBUWE69nLxN2K0TkzIplAoN/3hqai6kICSwqgQrLmBHf5beHMtmMpqx4dDivU42f4yhTqt/+t1I4OUJ0wLXSB71xL4aA/HY8TKHz5CH1yeu6aR5sggh9BfEzhdERJFM48Q+xDwwuwkGkvE8xYGegrhKiQg0KUv5FugPAdfoK+hKIpgzE4fjvzkd5U4MXbUsx5YwPihdTlQ5xDnsBegbfmbRqu8imtmqZIvlr7O9jtPRJB8G46ie5EEpryr91q2FZhKj/zoqaAx0V2VerMqpll9dXOsDis2QNf7wIEON3M2Eq/1/caVG92FUQFIbb4KgeyA0XXgt0F1KmtCxNnOmAjPc4f60JDz6FdY82GZQPQk795IxLZ+AZ/AF3lngDuR+yNUcJgqoRQpBMlG8O68CJyLfetNXin4HcqjIr7SD/7aVC0rB+ExahoIFCq+w/fmuk/HbpdY59WJK7YnNA20hGYZBG5Bi1R03RCmavlL4t2jBdd1TByOsUmp7CH798jmPH6GYFerxXDakOl0rWPJC9pQAAE2s2lIkvEbZ5KwoMnF5DW3pL5u9L6IOmx2p32LLPpgTZL0MXEGFxCpe4zQTvq6C8yjIQAmUeX7Y/uPG3vei3QiTZesN6VT9nsNi9GDOiu3kV+4Rf9LLhULL4LiZFStKdKUThuuInPKb9GZlhf67dzSHoHPHL5d6+wU4jrMQCKgKj2nLH9C0X/pvEIZXRgMr5CK/ckRQinupnTp51rBxetugE8Qeh6NJ4TJUPVda38LuFXOjs+QsO5pi8xPgo+uCuwPWdYbjc9+ZLG1chd7x6LceMtLKyoKO+GmhpqXOmyI8dT4iDUc+Cm3oe8RQe+pQpccaBAydX39KxWNr+U+owTTw9+h4hLIQ3lF+YUO2Ja985XC3LzuYW5kp7t6OPDYammfGRCgKLFKXEbhgUZwwEzm9jjTw8BfqITt7jztztaNwJGePwCKM7xTRX5X/OFQPjnCuFdp68aLJXrK9niqjy1llpMlpjuSgbhUnUZeoys+eGYIJH8mW5oKILUetdJOJLnMLX3O1uXkz0ie7i3/L/sOCK1+ygkm02BgaeN6rQCRKHXgfJ/RTQoPdIeUA9a9o2+z7967r0M0kIZWlrFdezXNVgMAxKoPP5JuM90e2fBXH0OUAEJW2CqNg/9NVWvx+g/Q+Rn2esZKQCZ5qveLnVZDulJ5UzuQDKIBmUL0UhQl0SokWl7myCu6+uxfDzzEAJSMxgDIi2WiUBmbg0OwlWnx/i4V0iB4lgld49FdcTwhToVjeAYC4MX7euQ1Etzcntdd4GaTViGuoA5cQ/4bI3V3TwJcLV3vPkbpoVRYINGCBP3luaK80aJqpljSG5otsmDjMbPtLPLJdFcl9bClqaUZZl0C1hx6/dWhOL1g9h5BdYs2I986TiX5wKUBO86c97tJyAA9oXDRID/a8v1Zj+x6oh/MIDp/tDSDq+I1+z3MvzisD8uzH7FIyUZzl/h6LQV3qm9yndNgoXO6N3qjSCp/wPatuA0a/IR0K37BmmcW8tHau7WlssYsfxQKM3C+NJJ0t4/e3Ib/ibCqNCKmQPdd6P/BJqIowpCtprQrtV2/gcwcnci12taNpF/YuVlW21Y4ckMYv7lMb1Rljj50f5PcniHJUa65bW7cLbs+mlh6cp1CkKfg+uD4Fr3PTw9wVyY+Cvsf7AzGa+nmrVRkYiDe5RjGYii/2rskwUVpoVZQZddekfiIk13GWotbzFWm7qPiGyitGUGv789DAatGBH1ivWlcwwUbA7gqFOzsyDI1f9vJmgYSzOe90y3AXVOxETbiGxPLOBa14YOkzd3KuLCQujWajZD7xsWXF7y2ZWJIxKY0ldJgO0+v7CRyrK3nBMC4L9xWptCiOBxSqjIcgwn+N6Q8McqobaJUheDeCuePJVO695HFodCQLDQ3NV97c9VnnCWfg8ARphtIr+oboYmdF6/s6zucf9wzRizRTVwR4eIWzs19ZLBquxQqjtIpxyEmhivS3k1GN0EpGLYOt8XXk+E160BRLB1Ke5yvwh5vw1cFSf5meN4otsyoFBnzdPSFNOqoQF1E4r2zKGYAzefroNI96H3luDB4jDPklbqicAaEGupJW4NKEnmNouw8Ydp5busugrQs88Yk/0aH9QZgm4iAtdCejPXtYZkl5rCFN9nTU+jfSb46Le9W9W4n88dKIulHI/PEr+fj+inWA1VyIPsu+eCxacpj3tQg5HTl3LGMUbU2ZE0jl1EpXKt65y1FOzL5SgEPvuTXKptOpJSpvr7qQ/8YgnxvUzZUAXKu3FavUTg7hAtYTIEEsJNmqt+y9pcdCDnthO1fRs5ANVejPHVHUkI8jKfJKxtAYFE55K+JBV6Oh5gue52jYroP4ghXhu+6Fbr9xwgFzbwICvGeIy44hV7zN8/NELEifuAKHq8QcaP7GXmp1pmPwzaiHBdV1yk9oHHT5tvheL5JViVyARjb3dtSiRaFbYDi4Op6HT00Vm0tBVazgX7L5vFz38nU7KO31qgFiIBzO5oUYn+zVBYzWJhnBR4LnTZj+7HvHSjOjm56sUdcBPPUZpnvyYBH2fH94rw5JVRFXflxybsCTdMfhawW+WXTMZXRZMHDigqSWXIW+StW1S30FhcbeJLJcD/ejiji/4SqucPBwQW1fdzgGA3dbQPHQNcXFX94FP71Gq+uIhHvJPBO655V+7DIO+LH1Fz0eYk/HhyRM/kyXEVN0Jo8LGhkf3Vx9v7h+kZNbhpOnleyIUU0k7wE8VQHFWNnxsjE0j60vNFGEMK57GS1bOx52JJvo80QJAmP1OcuXzYEoOwlE2KFnKsPE911NPkepKMdH6Cj9iL/Lp5c6Di0Ub1yYVUPQAced4mCVKk3FUZICQFTiciG0zdY44kHbshlEqlCK/W8hIUSPCqyF7RxvuCqzNPDvD1KQApFLLcuyzSoRr4BgzARzbODL3y+ywYTA8crwtciZaMSbZOLVw26JLpSkCLYwSG01vCBCrNHCrUwBj3hwbAxozc3/ZHpJJlnkad85XuQHenq6b8dgeANWbhw91XLYE5iVDhuVMHo+ulPtcJUYfLQEsjhaJFq2c3Bv3ELw/MUoluTLUDdJ0IG9EgVlHmq1/RJNT2wF3XGc3+DhxMQag4jG+uHWNqJ84skG+I6C6LVJLkbtG37jWXaCUdH+t1HiWBMxkcqpw7TAn0Hz1hGtHz/rOiJ9lJ1ZOP/yjeZZ0wKwkMTcpU3VkWPRjatFoQtumAoV7LGLy8CAvInOq+r3kdls9WvXfhQ== \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index f764efe2..c5e64cce 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -152,31 +152,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &20368557 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7322157958942142026, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &236055328 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 677548462} --- !u!1 &434624158 GameObject: m_ObjectHideFlags: 0 @@ -209,6 +184,7 @@ RectTransform: - {fileID: 475061233} - {fileID: 1275129623} - {fileID: 1725870972} + - {fileID: 2085388515} m_Father: {fileID: 966618983} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -307,19 +283,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2498033716723453584} m_PrefabAsset: {fileID: 0} ---- !u!114 &554441275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1455393705} --- !u!1 &579812654 GameObject: m_ObjectHideFlags: 0 @@ -404,18 +367,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4559813503860727169} m_PrefabAsset: {fileID: 0} ---- !u!114 &677548462 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5920014628783637860, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &966618982 GameObject: m_ObjectHideFlags: 0 @@ -534,19 +485,84 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 7328251774669809636} m_PrefabAsset: {fileID: 0} ---- !u!114 &1273053210 +--- !u!1 &1266828204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1266828205} + - component: {fileID: 1266828207} + - component: {fileID: 1266828206} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1266828205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266828204} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2085388515} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1266828206 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1266828204} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 2145763165} + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "Reset \nPlay Count" +--- !u!222 &1266828207 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266828204} + m_CullTransparentMesh: 0 --- !u!224 &1275129623 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5034752975213739508, guid: 199214813202e5f478789161b538685b, @@ -637,18 +653,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2498033716723453584} m_PrefabAsset: {fileID: 0} ---- !u!114 &1455393705 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7322157960896418141, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!20 &1673325602 stripped Camera: m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, @@ -774,32 +778,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1725870971} m_CullTransparentMesh: 0 ---- !u!114 &1759757039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1991749882} ---- !u!114 &1843256529 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 20368557} --- !u!1 &1870432532 GameObject: m_ObjectHideFlags: 0 @@ -870,6 +848,7 @@ MonoBehaviour: value: 1 character: {fileID: 519190655} resetScoreButton: {fileID: 1725870973} + resetPlayCountButton: {fileID: 2085388516} --- !u!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -883,18 +862,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stage: {fileID: 1448010325} ---- !u!114 &1991749882 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7322157960569866670, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2055584752 GameObject: m_ObjectHideFlags: 0 @@ -1020,18 +987,125 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a496a110325c47a18a0e9c6e60376b57, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2145763165 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7322157960751385535, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} +--- !u!1 &2085388514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2085388515} + - component: {fileID: 2085388518} + - component: {fileID: 2085388517} + - component: {fileID: 2085388516} + m_Layer: 5 + m_Name: Reset Score Button (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2085388515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085388514} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1266828205} + m_Father: {fileID: 434624159} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -162.02} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 1, y: 1} +--- !u!114 &2085388516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085388514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2085388517} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2085388517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085388514} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2085388518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085388514} + m_CullTransparentMesh: 0 --- !u!1001 &2498033716723453584 PrefabInstance: m_ObjectHideFlags: 0 @@ -1196,6 +1270,31 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 434624159} m_Modifications: + - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_SizeDelta.x + value: 406.80444 + objectReference: {fileID: 0} + - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_SizeDelta.y + value: 269.99994 + objectReference: {fileID: 0} + - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 460.4 + objectReference: {fileID: 0} + - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -134.99997 + objectReference: {fileID: 0} + - target: {fileID: 1480716767542757334, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4559813503976204841, guid: 041c0f3d96c90d64094cc76c5c87c26f, type: 3} propertyPath: m_AnchorMax.y @@ -1236,6 +1335,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4559813504302003085, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4559813504322426652, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4559813504355184344, guid: 041c0f3d96c90d64094cc76c5c87c26f, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index 01c95528..1624f3c5 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -1114,8 +1114,8 @@ MonoBehaviour: materialImage: {fileID: 5034752974552429102} materialAmountText: {fileID: 5034752974931089885} detailOffset: 250 - progressDuration: 2 - waitButtonActive: 2 + progressDuration: 1.5 + waitButtonActive: 3 waitProgress: 1.5 --- !u!1 &5034752975247083714 GameObject: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index 801cb383..bd4ee9e4 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -437,6 +437,7 @@ MonoBehaviour: stageHiScore: {fileID: 4559813503965715381} button: {fileID: 1185655514} lockObject: {fileID: 5937334820095103990} + lockText: {fileID: 8182159400137396076} --- !u!114 &1185655514 MonoBehaviour: m_ObjectHideFlags: 0 @@ -727,6 +728,7 @@ MonoBehaviour: stageHiScore: {fileID: 4559813505140573275} button: {fileID: 490767120} lockObject: {fileID: 2922673163823420152} + lockText: {fileID: 821365773376196194} --- !u!114 &490767120 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2039,6 +2041,7 @@ MonoBehaviour: stageHiScore: {fileID: 4559813503956947790} button: {fileID: 354011731} lockObject: {fileID: 5937334820449219531} + lockText: {fileID: 8182159399820554065} --- !u!1 &4559813505704525541 GameObject: m_ObjectHideFlags: 0 @@ -2438,18 +2441,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} ---- !u!1 &5937334820449219531 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, - type: 3} - m_PrefabInstance: {fileID: 4559813504394653454} - m_PrefabAsset: {fileID: 0} --- !u!224 &8190353373877730053 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} m_PrefabInstance: {fileID: 4559813504394653454} m_PrefabAsset: {fileID: 0} +--- !u!114 &8182159399820554065 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 4559813504394653454} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5937334820449219531 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 4559813504394653454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4559813504710053683 PrefabInstance: m_ObjectHideFlags: 0 @@ -2586,6 +2601,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4559813504710053683} m_PrefabAsset: {fileID: 0} +--- !u!114 &8182159400137396076 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 4559813504710053683} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5020804910926859837 PrefabInstance: m_ObjectHideFlags: 0 @@ -2710,18 +2737,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} ---- !u!1 &2922673163823420152 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, +--- !u!114 &821365773376196194 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} m_PrefabInstance: {fileID: 5020804910926859837} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &811553595295701558 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} m_PrefabInstance: {fileID: 5020804910926859837} m_PrefabAsset: {fileID: 0} +--- !u!1 &2922673163823420152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 5020804910926859837} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5218644843236717153 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/detail_NotReleased.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/detail_NotReleased.prefab index 42e04826..c4340fa4 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/detail_NotReleased.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/detail_NotReleased.prefab @@ -77,7 +77,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30E9\u30F3\u30AF10\u3067\u89E3\u653E" + m_Text: "\u4E2D\u7D1A\u306E\u30CF\u30A4\u30B9\u30B3\u30A2\nxx\u4EE5\u4E0A\u3067\u958B\u653E" --- !u!1 &4855167374259668059 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs index 7a502bae..5893e1fa 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs @@ -15,6 +15,7 @@ namespace MyGame.Scenes.MiniGame.Scripts private LineRenderer lineRendererFront; [SerializeField] private Transform character; [SerializeField] private Button resetScoreButton; + [SerializeField] private Button resetPlayCountButton; private void Start() { @@ -25,6 +26,11 @@ namespace MyGame.Scenes.MiniGame.Scripts GameDataManager.GameData.ScrollGamePlaceScoreList = new List(); GameDataManager.GameData.ScrollGameStageScoreList = new List(); }).AddTo(this); + + resetPlayCountButton.OnClickAsObservable().Subscribe(_ => + { + GameDataManager.GameData.ScrollGameTodayPlayCount = 0; + }).AddTo(this); var debugObject = new GameObject(){name = "debugObject"}; var orgScale = debugObject.transform.localScale; diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 69da54a9..b75dfcb9 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -74,8 +74,10 @@ namespace MyGame.Scenes.MiniGame.Scripts scoreUpdate.Subscribe(_ => { // スコア更新 - stageSelectView.SetScore(gameData.ScrollGamePlaceScoreList.FirstOrDefault(data => data.Id == placeId)?.Score ?? 0); + var placeScore = gameData.ScrollGamePlaceScoreList.FirstOrDefault(data => data.Id == placeId)?.Score ?? 0; + stageSelectView.SetScore(placeScore); // 達成報酬更新 + stageSelectView.SetRecipeActive(placeScore < levelPlaceList[1].needScore); }).AddTo(this); for (var i = 0; i < levelStageList.Length; i++) { @@ -88,6 +90,10 @@ namespace MyGame.Scenes.MiniGame.Scripts itemView.SetData(stageData); var isFirstStage = i == 0; var prevStageData = isFirstStage ? default : levelStageList[i - 1]; + if (prevStageData != null) + { + itemView.SetPrevStageData(prevStageData); + } scoreUpdate.Subscribe(_ => { // ハイスコア更新 @@ -278,8 +284,8 @@ namespace MyGame.Scenes.MiniGame.Scripts { ScrollGameWatchVideoDialog.ShowDialog(() => { - // GameDataManager.GameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary(); - // GameDataManager.GameData.ScrollGameTodayPlayCount++; + GameDataManager.GameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary(); + GameDataManager.GameData.ScrollGameTodayPlayCount++; // ステージ読み込み ResetGame(placeList, stageData); }); @@ -291,7 +297,7 @@ namespace MyGame.Scenes.MiniGame.Scripts private static void UpdatePlayCount() { // Playカウントリセット - // if (GameDataManager.GameData.GetScrollGameLimitTime().TotalSeconds <= 0) + if (GameDataManager.GameData.GetScrollGameLimitTime().TotalSeconds <= 0) { GameDataManager.GameData.ScrollGameTodayPlayCount = 0; } diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs index eab22878..70c0af5a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs @@ -25,10 +25,16 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private float waitButtonActive = .5f; [SerializeField] private float waitProgress = .5f; private float progressValue; + private Vector3 defaultDetailObjectPos; public IObservable OnRetry => retryButton.OnClickAsObservable().TakeUntilDestroy(this); public IObservable OnClose => closeButton.OnClickAsObservable().TakeUntilDestroy(this); + private void Awake() + { + defaultDetailObjectPos = detailObject.transform.localPosition; + } + public void ShowResult(int score, ScrollGamePlaceData[] placeList, ScrollGameStageData stageData) { var gameData = GameDataManager.GameData; @@ -62,7 +68,7 @@ namespace MyGame.Scenes.MiniGame.Scripts foreach (var placeData in placeList.Where(data => data.itemId != 0)) { var amount = Mathf.FloorToInt((float)score / placeData.needScore); - var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId); + var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId && data.Category == ItemCategory.Material); materialNameText.text = shopData.Name; // materialImage materialAmountText.text = $"x{amount}"; @@ -73,6 +79,9 @@ namespace MyGame.Scenes.MiniGame.Scripts .OrderBy(data => data.needScore) // .Where(data => !gameData.MyRecipes.Contains(data.recipeId)) .FirstOrDefault(data => data.recipeId != 0); +#if UNITY_EDITOR + recipePlaceData = prevPlaceScore < recipePlaceData.needScore ? recipePlaceData : null; +#endif if (recipePlaceData != null && placeScoreData.Score >= recipePlaceData.needScore) { if (!gameData.MyRecipes.Contains(recipePlaceData.recipeId)) @@ -89,19 +98,25 @@ namespace MyGame.Scenes.MiniGame.Scripts detailObject.SetActive(true); // 商品獲得済みならレシピ非表示 - if (prevPlaceScore >= recipePlaceData.needScore) - // if (recipePlaceData is null) + if (recipePlaceData is null) { // detailの表示位置変更 detailObject.transform.SetLocalPositionY(detailOffset); } else { + detailObject.transform.SetLocalPositionY(defaultDetailObjectPos.y); meterObject.SetActive(true); SetProgress((float)prevPlaceScore / recipePlaceData.needScore, false); this.CallWaitForSeconds(waitProgress, () => { - SetProgress((float)placeScoreData.Score / recipePlaceData.needScore); + SetProgress((float)placeScoreData.Score / recipePlaceData.needScore, true, () => + { + if (placeScoreData.Score >= recipePlaceData.needScore) + { + ShopItemExchangeView.ShowDialog(shopDataList.FirstOrDefault(data => data.itemId == recipePlaceData.recipeId && data.Category == ItemCategory.Recipe)); + } + }); }); } this.CallWaitForSeconds(waitButtonActive, () => diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs index d744be84..a757f06a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs @@ -11,8 +11,8 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private Text stageHiScore; [SerializeField] private Button button; [SerializeField] private GameObject lockObject; + [SerializeField] private Text lockText; private readonly IntReactiveProperty hiScore = new IntReactiveProperty(); - private int needScore; private void Start() { @@ -27,9 +27,26 @@ namespace MyGame.Scenes.MiniGame.Scripts public IObservable OnClick => button.OnClickAsObservable().TakeUntilDestroy(this); + public void SetPrevStageData(ScrollGameStageData stageData) + { + switch (stageData.Difficulty) + { + case ScrollGameDifficulty.Easy: + lockText.text = $"初級のハイスコア{stageData.needScore}以上で開放"; + break; + case ScrollGameDifficulty.Normal: + lockText.text = $"中級のハイスコア{stageData.needScore}以上で開放"; + break; + case ScrollGameDifficulty.Hard: + lockText.text = string.Empty; + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + public void SetData(ScrollGameStageData stageData) { - needScore = stageData.needScore; // stageName.text = stageData.id.ToString(); } diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs index 0810741c..903ed991 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs @@ -42,5 +42,10 @@ namespace MyGame.Scenes.MiniGame.Scripts } } } + + public void SetRecipeActive(bool active) + { + recipeObject.SetActive(active); + } } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 3452336d..62044d39 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -51,13 +51,14 @@ public class Shopping : MonoBehaviour { HeartMeter.Instance.AddHeart(pair.Current - pair.Previous); }).AddTo(this); + + // 表示するShopDataを制限 + var filteredShopDataList = shopDataList + .Where(data => !data.IsHide) + .Where(data => data.Category != ItemCategory.Special); - foreach (var shopData in shopDataList) + foreach (var shopData in filteredShopDataList) { - if (shopData.Category == ItemCategory.Special) - { - continue; - } var itemView = listView.AddItemView(shopData); itemView.SetData(shopData); itemView.SetStockCount(GetItemAmount(shopData)); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 49d1df18..c9d1c5c9 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -448,10 +448,12 @@ public sealed class ShopData { public int category; public int consumeType; public string prefabName; + public int hide; public string Name => LocalizationManager.GetTranslation($"Item/MaterialName{id:0000}"); public string Text => LocalizationManager.GetTranslation($"Item/MaterialText{id:0000}"); public ItemCategory Category => (ItemCategory)category; public ShopItemType ConsumeType => (ShopItemType)consumeType; + public bool IsHide => hide == 1; public Transform GetPrefab() { @@ -553,4 +555,5 @@ public sealed class ScrollGameStageData public int needScore; public string beginPrefabName; public string randomPrefabName; + public ScrollGameDifficulty Difficulty => (ScrollGameDifficulty)difficulty; } \ No newline at end of file