diff --git a/Assets/ResWork/ChapterQuest/ChapterQuest_GetItemObj.cs b/Assets/ResWork/ChapterQuest/ChapterQuest_GetItemObj.cs index afa34e9f1..794895b31 100644 --- a/Assets/ResWork/ChapterQuest/ChapterQuest_GetItemObj.cs +++ b/Assets/ResWork/ChapterQuest/ChapterQuest_GetItemObj.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.AI; @@ -48,7 +46,7 @@ public class ChapterQuest_GetItemObj : MonoBehaviour } else offtime = 1f; - GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem }); + //GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem }); } } } \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/AchievementsMission.json b/Assets/ResWork/Table/Export/AchievementsMission.json deleted file mode 100644 index 91c578d9f..000000000 --- a/Assets/ResWork/Table/Export/AchievementsMission.json +++ /dev/null @@ -1 +0,0 @@ -[{"n_MissionIndex": "1", "e_Purpose": "MakeBook", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "고서 1종 완성", "Info": ""}, {"n_MissionIndex": "2", "e_Purpose": "MakeBook", "n_PurposeCount": "3", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "고서 3종 완성", "Info": ""}, {"n_MissionIndex": "3", "e_Purpose": "MakeBook", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "5000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "고서 5종 완성", "Info": ""}, {"n_MissionIndex": "4", "e_Purpose": "MakeBook", "n_PurposeCount": "9", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "고서 9종 완성", "Info": ""}, {"n_MissionIndex": "5", "e_Purpose": "ObtainLegendWeapon", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 지팡이 모두 획득", "Info": ""}, {"n_MissionIndex": "6", "e_Purpose": "ObtainMythWeapon", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 지팡이 모두 획득", "Info": ""}, {"n_MissionIndex": "7", "e_Purpose": "ObtainLegendRing", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 반지 모두 획득", "Info": ""}, {"n_MissionIndex": "8", "e_Purpose": "ObtainMythRing", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 반지 모두 획득", "Info": ""}, {"n_MissionIndex": "9", "e_Purpose": "ObtainLegendNeck", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 목걸이 모두 획득", "Info": ""}, {"n_MissionIndex": "10", "e_Purpose": "ObtainMythNeck", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 목걸이 모두 획득", "Info": ""}, {"n_MissionIndex": "11", "e_Purpose": "ObtainLegendBoots", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 신발 모두 획득", "Info": ""}, {"n_MissionIndex": "12", "e_Purpose": "ObtainMythBoots", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 신발 모두 획득", "Info": ""}, {"n_MissionIndex": "13", "e_Purpose": "ObtainLegendFairy", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 요정 모두 획득", "Info": ""}, {"n_MissionIndex": "14", "e_Purpose": "ObtainMythFairy", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 요정 모두 획득", "Info": ""}, {"n_MissionIndex": "15", "e_Purpose": "ObtainLegendMagic", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 마법 모두 획득", "Info": ""}, {"n_MissionIndex": "16", "e_Purpose": "ObtainMythMagic", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 마법 모두 획득", "Info": ""}, {"n_MissionIndex": "17", "e_Purpose": "BloomMagic", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "4개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "18", "e_Purpose": "BloomMagic", "n_PurposeCount": "8", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "8개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "19", "e_Purpose": "BloomMagic", "n_PurposeCount": "12", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "12개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "20", "e_Purpose": "BloomMagic", "n_PurposeCount": "16", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "16개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "21", "e_Purpose": "BloomMagic", "n_PurposeCount": "20", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "20개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "22", "e_Purpose": "BloomMagic", "n_PurposeCount": "24", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "3000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "24개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "23", "e_Purpose": "BloomMagic", "n_PurposeCount": "28", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "4000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "28개의 마법 모두 개화", "Info": ""}, {"n_MissionIndex": "24", "e_Purpose": "ObtainLegendPet", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "전설 펫 모두 획득", "Info": ""}, {"n_MissionIndex": "25", "e_Purpose": "ObtainMythPet", "n_PurposeCount": "4", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신화 펫 모두 획득", "Info": ""}, {"n_MissionIndex": "26", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Gold", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "27", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Gold", "n_RewardID": "0", "n_RewardAmount": "2000", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "28", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Gold", "n_RewardID": "0", "n_RewardAmount": "3000", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "29", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 클리어", "Info": ""}, {"n_MissionIndex": "30", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "31", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "1", "Desc": "1챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "32", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "101", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "33", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "102", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "34", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "103", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "35", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 클리어", "Info": ""}, {"n_MissionIndex": "36", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "600", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "37", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1100", "b_GuideEffectShow": "False", "Chapter": "2", "Desc": "2챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "38", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "104", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "39", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "105", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "40", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "106", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "41", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "300", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 클리어", "Info": ""}, {"n_MissionIndex": "42", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "700", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "43", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1200", "b_GuideEffectShow": "False", "Chapter": "3", "Desc": "3챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "44", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "107", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "45", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "108", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "46", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "109", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "47", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "400", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 클리어", "Info": ""}, {"n_MissionIndex": "48", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "800", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "49", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1300", "b_GuideEffectShow": "False", "Chapter": "4", "Desc": "4챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "50", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "110", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "51", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "111", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "52", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "112", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "53", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "500", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 클리어", "Info": ""}, {"n_MissionIndex": "54", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "900", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "55", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1400", "b_GuideEffectShow": "False", "Chapter": "5", "Desc": "5챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "56", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "113", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "57", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "114", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "58", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "115", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "59", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "600", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 클리어", "Info": ""}, {"n_MissionIndex": "60", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "61", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1500", "b_GuideEffectShow": "False", "Chapter": "6", "Desc": "6챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "62", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "116", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "63", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "117", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "64", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "118", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "65", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "700", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 클리어", "Info": ""}, {"n_MissionIndex": "66", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1100", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "67", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1600", "b_GuideEffectShow": "False", "Chapter": "7", "Desc": "7챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "68", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "119", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "69", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Food", "n_RewardID": "120", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "70", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "71", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "800", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 클리어", "Info": ""}, {"n_MissionIndex": "72", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1200", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "73", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1700", "b_GuideEffectShow": "False", "Chapter": "8", "Desc": "8챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "74", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "75", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "76", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "77", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "900", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 클리어", "Info": ""}, {"n_MissionIndex": "78", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1300", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "79", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1800", "b_GuideEffectShow": "False", "Chapter": "9", "Desc": "9챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "80", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "81", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "82", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "83", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 클리어", "Info": ""}, {"n_MissionIndex": "84", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1400", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "85", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1900", "b_GuideEffectShow": "False", "Chapter": "10", "Desc": "10챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "86", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "87", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "88", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "89", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1100", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 클리어", "Info": ""}, {"n_MissionIndex": "90", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1500", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "91", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2000", "b_GuideEffectShow": "False", "Chapter": "11", "Desc": "11챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "92", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "93", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "94", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "95", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1200", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 클리어", "Info": ""}, {"n_MissionIndex": "96", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1600", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "97", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2100", "b_GuideEffectShow": "False", "Chapter": "12", "Desc": "12챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "98", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "99", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "100", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "101", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1300", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 클리어", "Info": ""}, {"n_MissionIndex": "102", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1700", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "103", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2200", "b_GuideEffectShow": "False", "Chapter": "13", "Desc": "13챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "104", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "105", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "106", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "107", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1400", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 클리어", "Info": ""}, {"n_MissionIndex": "108", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1800", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "109", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2300", "b_GuideEffectShow": "False", "Chapter": "14", "Desc": "14챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "110", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "2", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "111", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "4", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "112", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "6", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "113", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 클리어", "Info": ""}, {"n_MissionIndex": "114", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "115", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "30", "b_GuideEffectShow": "False", "Chapter": "15", "Desc": "15챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "116", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "2", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "117", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "4", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "118", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "6", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "119", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 클리어", "Info": ""}, {"n_MissionIndex": "120", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "121", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "50", "n_RewardAmount": "30", "b_GuideEffectShow": "False", "Chapter": "16", "Desc": "16챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "122", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "2", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "123", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "4", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "124", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "6", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "125", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 클리어", "Info": ""}, {"n_MissionIndex": "126", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "20", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "127", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "51", "n_RewardAmount": "30", "b_GuideEffectShow": "False", "Chapter": "17", "Desc": "17챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "128", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "129", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "130", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "131", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1800", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 클리어", "Info": ""}, {"n_MissionIndex": "132", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2200", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "133", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2700", "b_GuideEffectShow": "False", "Chapter": "18", "Desc": "18챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "134", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "135", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "136", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "137", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1900", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 클리어", "Info": ""}, {"n_MissionIndex": "138", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2300", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "139", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2800", "b_GuideEffectShow": "False", "Chapter": "19", "Desc": "19챕터 5분내 클리어", "Info": "5"}, {"n_MissionIndex": "140", "e_Purpose": "Stage3Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 3스테이지 클리어", "Info": "3"}, {"n_MissionIndex": "141", "e_Purpose": "Stage5Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "150", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 5스테이지 클리어", "Info": "5"}, {"n_MissionIndex": "142", "e_Purpose": "Stage8Clear", "n_PurposeCount": "1", "e_Reward": "AllGambleTicket", "n_RewardID": "0", "n_RewardAmount": "200", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 8스테이지 클리어", "Info": "8"}, {"n_MissionIndex": "143", "e_Purpose": "ChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2000", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 클리어", "Info": ""}, {"n_MissionIndex": "144", "e_Purpose": "Time10Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2400", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 10분내 클리어", "Info": "10"}, {"n_MissionIndex": "145", "e_Purpose": "Time5Min", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "2900", "b_GuideEffectShow": "False", "Chapter": "20", "Desc": "20챕터 5분내 클리어", "Info": "5"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/AchievementsMission.json.meta b/Assets/ResWork/Table/Export/AchievementsMission.json.meta deleted file mode 100644 index 7af4a8850..000000000 --- a/Assets/ResWork/Table/Export/AchievementsMission.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 92b1411bbe8f7964b8634eb1ba50862a -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/Export/DailyMission.json b/Assets/ResWork/Table/Export/DailyMission.json deleted file mode 100644 index 62e0d5b58..000000000 --- a/Assets/ResWork/Table/Export/DailyMission.json +++ /dev/null @@ -1 +0,0 @@ -[{"n_MissionIndex": "1", "e_Purpose": "AnyChapterClear", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "아무 챕터 1회 클리어", "Info": ""}, {"n_MissionIndex": "2", "e_Purpose": "MobKill", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "몬스터 처치 100회", "Info": ""}, {"n_MissionIndex": "3", "e_Purpose": "BossKill", "n_PurposeCount": "20", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "보스 처치 20회", "Info": ""}, {"n_MissionIndex": "4", "e_Purpose": "Summon_Weapon", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "지팡이 15회 뽑기", "Info": ""}, {"n_MissionIndex": "5", "e_Purpose": "Summon_Ring", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "반지 15회 뽑기", "Info": ""}, {"n_MissionIndex": "6", "e_Purpose": "Summon_Neck", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "목걸이 15회 뽑기", "Info": ""}, {"n_MissionIndex": "7", "e_Purpose": "Summon_Boots", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신발 15회 뽑기", "Info": ""}, {"n_MissionIndex": "8", "e_Purpose": "Summon_Fairy", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "요정 15회 뽑기", "Info": ""}, {"n_MissionIndex": "9", "e_Purpose": "Summon_Magic", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마법 15회 뽑기", "Info": ""}, {"n_MissionIndex": "10", "e_Purpose": "Summon_Pet", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 15회 뽑기", "Info": ""}, {"n_MissionIndex": "11", "e_Purpose": "SowSeed", "n_PurposeCount": "10", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "1", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "농작물 10회 심기", "Info": ""}, {"n_MissionIndex": "12", "e_Purpose": "Harvest", "n_PurposeCount": "10", "e_Reward": "Inven", "n_RewardID": "49", "n_RewardAmount": "1", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "농작물 10회 수확하기", "Info": ""}, {"n_MissionIndex": "13", "e_Purpose": "PlayTime", "n_PurposeCount": "1800", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "플레이 시간 1800초", "Info": ""}, {"n_MissionIndex": "14", "e_Purpose": "WitchEnchant", "n_PurposeCount": "10", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마녀 능력치 강화 10회", "Info": ""}, {"n_MissionIndex": "15", "e_Purpose": "Reinforce_Pet", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 강화 1회", "Info": ""}, {"n_MissionIndex": "16", "e_Purpose": "ShowAD", "n_PurposeCount": "10", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "15", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "광고 시청 10회", "Info": ""}, {"n_MissionIndex": "17", "e_Purpose": "SelectSkill", "n_PurposeCount": "20", "e_Reward": "SelectSkillShuffle", "n_RewardID": "0", "n_RewardAmount": "2", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "스킬 선택 20회", "Info": ""}, {"n_MissionIndex": "18", "e_Purpose": "CompleteDailyQuest", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "400", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "일일 퀘스트 15회 완료", "Info": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/DailyMission.json.meta b/Assets/ResWork/Table/Export/DailyMission.json.meta deleted file mode 100644 index 6166996fa..000000000 --- a/Assets/ResWork/Table/Export/DailyMission.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ee6dfb0e49477a241bd1e825bf7b0237 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/Export/GuideQuest.json b/Assets/ResWork/Table/Export/GuideQuest.json deleted file mode 100644 index 5c9c15678..000000000 --- a/Assets/ResWork/Table/Export/GuideQuest.json +++ /dev/null @@ -1 +0,0 @@ -[{"n_MissionIndex": "0", "e_Purpose": "QuestEnter", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "퀘스트 → 입장", "Target": "icon_note", "TargetSub": "empty"}, {"n_MissionIndex": "1", "e_Purpose": "JoystickAttack", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "조이스틱으로 적에게\n접근해 공격", "Target": "joystickbg", "TargetSub": "joystick"}, {"n_MissionIndex": "2", "e_Purpose": "JoystickChest", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "조이스틱으로 이동해\n상자 획득", "Target": "joystickbg", "TargetSub": "joystick"}, {"n_MissionIndex": "3", "e_Purpose": "ScreenRot", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "화면 회전", "Target": "empty", "TargetSub": "empty"}, {"n_MissionIndex": "4", "e_Purpose": "AutoTarget", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "자동 타겟 설정", "Target": "autotarget_off", "TargetSub": "empty"}, {"n_MissionIndex": "5", "e_Purpose": "ShootMagic", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "적에게 마법 공격", "Target": "magic_icebolt", "TargetSub": "empty"}, {"n_MissionIndex": "6", "e_Purpose": "AutoMagic", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "자동 마법 설정", "Target": "automagic_off", "TargetSub": "empty"}, {"n_MissionIndex": "7", "e_Purpose": "GetDropItem", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "떨어진 아이템 줍기\n(강화석, 하트 등)", "Target": "joystickbg", "TargetSub": "joystick"}, {"n_MissionIndex": "8", "e_Purpose": "Clear1_2", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "1-2 클리어", "Target": "bossicon", "TargetSub": "empty"}, {"n_MissionIndex": "9", "e_Purpose": "DieOrQuit", "n_PurposeCount": "1", "e_Reward": "Gold", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "True", "Desc": "일시정지 → 나가기\n혹은 마녀 사망", "Target": "pause", "TargetSub": "empty"}, {"n_MissionIndex": "10", "e_Purpose": "WitchStat", "n_PurposeCount": "1", "e_Reward": "WeaponTicket", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "True", "Desc": "마녀 스탯 강화", "Target": "menu_witch", "TargetSub": "empty"}, {"n_MissionIndex": "11", "e_Purpose": "GambleWeapon", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "지팡이 뽑기", "Target": "menu_gamble", "TargetSub": "empty"}, {"n_MissionIndex": "12", "e_Purpose": "EqiupWeapon", "n_PurposeCount": "1", "e_Reward": "FairyTicket", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "True", "Desc": "지팡이 착용", "Target": "menu_equipment", "TargetSub": "empty"}, {"n_MissionIndex": "13", "e_Purpose": "GambleFairy", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "아이템을 주워주는\n요정 뽑기", "Target": "menu_gamble", "TargetSub": "empty"}, {"n_MissionIndex": "14", "e_Purpose": "EqiupFairy", "n_PurposeCount": "1", "e_Reward": "PetTicket", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "True", "Desc": "아이템을 주워주는\n요정 착용", "Target": "menu_equipment", "TargetSub": "empty"}, {"n_MissionIndex": "15", "e_Purpose": "GamblePet", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "든든한 동료인\n펫 뽑기", "Target": "menu_gamble", "TargetSub": "empty"}, {"n_MissionIndex": "16", "e_Purpose": "EquipPet", "n_PurposeCount": "1", "e_Reward": "Gold", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "True", "Desc": "든든한 동료인\n펫 착용", "Target": "menu_pet", "TargetSub": "empty"}, {"n_MissionIndex": "17", "e_Purpose": "PetStat", "n_PurposeCount": "1", "e_Reward": "MagicTicket", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "True", "Desc": "펫 스탯 강화", "Target": "menu_pet", "TargetSub": "empty"}, {"n_MissionIndex": "18", "e_Purpose": "GambleMagic", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "마법 뽑기", "Target": "menu_gamble", "TargetSub": "empty"}, {"n_MissionIndex": "19", "e_Purpose": "QuestEnter", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "퀘스트 → 입장", "Target": "icon_note", "TargetSub": "empty"}, {"n_MissionIndex": "20", "e_Purpose": "Clear1_5", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "1-5 클리어", "Target": "bossicon", "TargetSub": "empty"}, {"n_MissionIndex": "21", "e_Purpose": "Clear1_10", "n_PurposeCount": "1", "e_Reward": "Ring", "n_RewardID": "1", "n_RewardAmount": "11", "b_GuideEffectShow": "True", "Desc": "1-10 클리어", "Target": "bossicon", "TargetSub": "empty"}, {"n_MissionIndex": "22", "e_Purpose": "MixRing", "n_PurposeCount": "1", "e_Reward": "Skill", "n_RewardID": "1", "n_RewardAmount": "20", "b_GuideEffectShow": "True", "Desc": "반지 합성", "Target": "menu_equipment", "TargetSub": "empty"}, {"n_MissionIndex": "23", "e_Purpose": "EnchantMagic", "n_PurposeCount": "1", "e_Reward": "Pet", "n_RewardID": "1", "n_RewardAmount": "11", "b_GuideEffectShow": "True", "Desc": "마법 강화", "Target": "menu_equipment", "TargetSub": "empty"}, {"n_MissionIndex": "24", "e_Purpose": "EnchantPet", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "펫 강화", "Target": "menu_pet", "TargetSub": "empty"}, {"n_MissionIndex": "25", "e_Purpose": "FreePackage", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "무료 패키지 받기\n(상점 - 패키지)", "Target": "menu_shop", "TargetSub": "empty"}, {"n_MissionIndex": "26", "e_Purpose": "CombinePotion", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "솥에서 포션 조제", "Target": "menu_kettle", "TargetSub": "empty"}, {"n_MissionIndex": "27", "e_Purpose": "UsePotion", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "포션 사용", "Target": "menu_kettle", "TargetSub": "empty"}, {"n_MissionIndex": "28", "e_Purpose": "LookBook", "n_PurposeCount": "1", "e_Reward": "Inven", "n_RewardID": "1", "n_RewardAmount": "1", "b_GuideEffectShow": "True", "Desc": "고서 보기", "Target": "menu_book", "TargetSub": "empty"}, {"n_MissionIndex": "29", "e_Purpose": "UseGoldPouch", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "가방에서 골드 주머니\n사용", "Target": "btn_bag", "TargetSub": "empty"}, {"n_MissionIndex": "30", "e_Purpose": "ChangeTitle", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "애기집사로 칭호\n바꾸기", "Target": "btn_title", "TargetSub": "empty"}, {"n_MissionIndex": "31", "e_Purpose": "GetMissionReward", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "미션 보상 받기", "Target": "btn_achievement", "TargetSub": "empty"}, {"n_MissionIndex": "32", "e_Purpose": "GetPass", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "패스 출석보상 받기", "Target": "icon_pass", "TargetSub": "empty"}, {"n_MissionIndex": "33", "e_Purpose": "OptionHelp", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "설정 - 도움말 확인", "Target": "btn_option", "TargetSub": "empty"}, {"n_MissionIndex": "34", "e_Purpose": "NickChange", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "마녀 이름 변경하기", "Target": "bookpage", "TargetSub": "empty"}, {"n_MissionIndex": "35", "e_Purpose": "ChapterChange", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "2챕터로 이동하기", "Target": "btn_map", "TargetSub": "empty"}, {"n_MissionIndex": "36", "e_Purpose": "Coupon", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "True", "Desc": "채팅에서 쿠폰 받기\n/작은마녀", "Target": "btn_chat", "TargetSub": "empty"}, {"n_MissionIndex": "37", "e_Purpose": "Complete", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "1000", "b_GuideEffectShow": "True", "Desc": "가이드 퀘스트 완료", "Target": "", "TargetSub": "empty"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/MissionList.json b/Assets/ResWork/Table/Export/MissionList.json new file mode 100644 index 000000000..6882fb616 --- /dev/null +++ b/Assets/ResWork/Table/Export/MissionList.json @@ -0,0 +1 @@ +[{"n_MissionIndex": "1", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100001", "e_MissionConditionType": "DAILY_MISSION_CLEAR_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "5", "e_RewardType": "", "n_RewardValue": "1", "n_RewardCount": "100", "b_RepeatMission": "False"}, {"n_MissionIndex": "2", "n_MissionGroupId": "0", "s_LinkedQuestType": "None", "n_MissionDesc": "100002", "e_MissionConditionType": "KILL_MONSTER_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "20", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "1000", "b_RepeatMission": "False"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GuideQuest.json.meta b/Assets/ResWork/Table/Export/MissionList.json.meta similarity index 75% rename from Assets/ResWork/Table/Export/GuideQuest.json.meta rename to Assets/ResWork/Table/Export/MissionList.json.meta index c7d06802b..2df40819e 100644 --- a/Assets/ResWork/Table/Export/GuideQuest.json.meta +++ b/Assets/ResWork/Table/Export/MissionList.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be09be07a7b454848becb70fa1fbcc9e +guid: 51efd81c7a03d1443a7a9a52f07d826d TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/ResWork/Table/Export/RepeatMission.json b/Assets/ResWork/Table/Export/RepeatMission.json deleted file mode 100644 index d27787673..000000000 --- a/Assets/ResWork/Table/Export/RepeatMission.json +++ /dev/null @@ -1 +0,0 @@ -[{"n_MissionIndex": "1", "e_Purpose": "MobKill", "n_PurposeCount": "2000", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "몬스터 처치 2000회", "Info": ""}, {"n_MissionIndex": "2", "e_Purpose": "BossKill", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "보스 처치 100회", "Info": ""}, {"n_MissionIndex": "3", "e_Purpose": "Summon_Weapon", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "지팡이 100회 뽑기", "Info": ""}, {"n_MissionIndex": "4", "e_Purpose": "Summon_Ring", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "반지 100회 뽑기", "Info": ""}, {"n_MissionIndex": "5", "e_Purpose": "Summon_Neck", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "목걸이 100회 뽑기", "Info": ""}, {"n_MissionIndex": "6", "e_Purpose": "Summon_Boots", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신발 100회 뽑기", "Info": ""}, {"n_MissionIndex": "7", "e_Purpose": "Summon_Fairy", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "요정 100회 뽑기", "Info": ""}, {"n_MissionIndex": "8", "e_Purpose": "Summon_Magic", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마법 100회 뽑기", "Info": ""}, {"n_MissionIndex": "9", "e_Purpose": "SowSeed", "n_PurposeCount": "20", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "농작물 20회 심기", "Info": ""}, {"n_MissionIndex": "10", "e_Purpose": "Harvest", "n_PurposeCount": "20", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "농작물 20회 수확하기", "Info": ""}, {"n_MissionIndex": "11", "e_Purpose": "PlayTime", "n_PurposeCount": "1800", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "플레이 시간 1800초", "Info": ""}, {"n_MissionIndex": "12", "e_Purpose": "WitchEnchant", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마녀 능력치 강화 100회", "Info": ""}, {"n_MissionIndex": "13", "e_Purpose": "Reinforce_Pet", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 5회 강화", "Info": ""}, {"n_MissionIndex": "14", "e_Purpose": "ShowAD", "n_PurposeCount": "10", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "광고 시청 10회", "Info": ""}, {"n_MissionIndex": "15", "e_Purpose": "SelectSkill", "n_PurposeCount": "20", "e_Reward": "SelectSkillShuffle", "n_RewardID": "0", "n_RewardAmount": "2", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "스킬 선택 20회", "Info": ""}, {"n_MissionIndex": "16", "e_Purpose": "Mix_Weapon", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "지팡이 5회 합성", "Info": ""}, {"n_MissionIndex": "17", "e_Purpose": "Mix_Ring", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "반지 5회 합성", "Info": ""}, {"n_MissionIndex": "18", "e_Purpose": "Mix_Neck", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "목걸이 5회 합성", "Info": ""}, {"n_MissionIndex": "19", "e_Purpose": "Mix_Boots", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신발 5회 합성", "Info": ""}, {"n_MissionIndex": "20", "e_Purpose": "Mix_Fairy", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "요정 5회 합성", "Info": ""}, {"n_MissionIndex": "21", "e_Purpose": "Mix_Pet", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 5회 합성", "Info": ""}, {"n_MissionIndex": "22", "e_Purpose": "Mix_Magic", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마법 5회 합성", "Info": ""}, {"n_MissionIndex": "23", "e_Purpose": "Transcend_Weapon", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "지팡이 1회 초월", "Info": ""}, {"n_MissionIndex": "24", "e_Purpose": "Transcend_Ring", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "반지 1회 초월", "Info": ""}, {"n_MissionIndex": "25", "e_Purpose": "Transcend_Neck", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "목걸이 1회 초월", "Info": ""}, {"n_MissionIndex": "26", "e_Purpose": "Transcend_Boots", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "신발 1회 초월", "Info": ""}, {"n_MissionIndex": "27", "e_Purpose": "Transcend_Fairy", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "요정 1회 초월", "Info": ""}, {"n_MissionIndex": "28", "e_Purpose": "Transcend_Pet", "n_PurposeCount": "1", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 1회 초월", "Info": ""}, {"n_MissionIndex": "29", "e_Purpose": "Summon_Pet", "n_PurposeCount": "100", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "펫 100회 뽑기", "Info": ""}, {"n_MissionIndex": "30", "e_Purpose": "Reinforce_Magic", "n_PurposeCount": "5", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "마법 5회 강화", "Info": ""}, {"n_MissionIndex": "31", "e_Purpose": "Enter_Mfield", "n_PurposeCount": "3", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "기억의 들판 3회 플레이", "Info": ""}, {"n_MissionIndex": "32", "e_Purpose": "Enter_Mforest", "n_PurposeCount": "6", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "기억의 숲 6회 플레이", "Info": ""}, {"n_MissionIndex": "33", "e_Purpose": "Enter_Mdungeon", "n_PurposeCount": "3", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "기억의 던전 3회 플레이", "Info": ""}, {"n_MissionIndex": "34", "e_Purpose": "Enter_Mwitch", "n_PurposeCount": "3", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "기억의 마녀 3회 플레이", "Info": ""}, {"n_MissionIndex": "35", "e_Purpose": "Enter_MPetBattle", "n_PurposeCount": "15", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "100", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "기억의 투견장 15회 플레이", "Info": ""}, {"n_MissionIndex": "36", "e_Purpose": "Make_Potion", "n_PurposeCount": "10", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "포션 조제 10회", "Info": ""}, {"n_MissionIndex": "37", "e_Purpose": "Make_Relic", "n_PurposeCount": "10", "e_Reward": "Gem", "n_RewardID": "0", "n_RewardAmount": "10", "b_GuideEffectShow": "False", "Chapter": "0", "Desc": "유물 조제 10회", "Info": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/RepeatMission.json.meta b/Assets/ResWork/Table/Export/RepeatMission.json.meta deleted file mode 100644 index e3621aa8c..000000000 --- a/Assets/ResWork/Table/Export/RepeatMission.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ce8fe8425e5836f48a83cc6f060b1683 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 3196691a1..132024b0b 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UI/Res/menu_book.png b/Assets/ResWork/UI/Res/menu_book.png deleted file mode 100644 index ef8b7929f..000000000 Binary files a/Assets/ResWork/UI/Res/menu_book.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_book.png.meta b/Assets/ResWork/UI/Res/menu_book.png.meta deleted file mode 100644 index 9030dea46..000000000 --- a/Assets/ResWork/UI/Res/menu_book.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 788dc37490addf949b0b7825e1721cc0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_equipment.png b/Assets/ResWork/UI/Res/menu_equipment.png deleted file mode 100644 index 800e33883..000000000 Binary files a/Assets/ResWork/UI/Res/menu_equipment.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_equipment.png.meta b/Assets/ResWork/UI/Res/menu_equipment.png.meta deleted file mode 100644 index b896c606c..000000000 --- a/Assets/ResWork/UI/Res/menu_equipment.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 78b4d88aa4bb6b345b3a82ca918abd47 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_exit.png b/Assets/ResWork/UI/Res/menu_exit.png deleted file mode 100644 index 3ec3e1ded..000000000 Binary files a/Assets/ResWork/UI/Res/menu_exit.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_exit.png.meta b/Assets/ResWork/UI/Res/menu_exit.png.meta deleted file mode 100644 index 4765a6676..000000000 --- a/Assets/ResWork/UI/Res/menu_exit.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: fb49f64eacfff3d4ab9505ed46514b97 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_explore.png b/Assets/ResWork/UI/Res/menu_explore.png deleted file mode 100644 index a3359e541..000000000 Binary files a/Assets/ResWork/UI/Res/menu_explore.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_explore.png.meta b/Assets/ResWork/UI/Res/menu_explore.png.meta deleted file mode 100644 index 8ae06cbcd..000000000 --- a/Assets/ResWork/UI/Res/menu_explore.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 66f7047f13d3e4a44a827c20eb82d6e3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_gamble.png b/Assets/ResWork/UI/Res/menu_gamble.png deleted file mode 100644 index dac94e07b..000000000 Binary files a/Assets/ResWork/UI/Res/menu_gamble.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_gamble.png.meta b/Assets/ResWork/UI/Res/menu_gamble.png.meta deleted file mode 100644 index 0355fc7f0..000000000 --- a/Assets/ResWork/UI/Res/menu_gamble.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 3ff8462d6d93c8244a6525ae7e0ccf45 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_kettle.png b/Assets/ResWork/UI/Res/menu_kettle.png deleted file mode 100644 index dabf9a110..000000000 Binary files a/Assets/ResWork/UI/Res/menu_kettle.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_kettle.png.meta b/Assets/ResWork/UI/Res/menu_kettle.png.meta deleted file mode 100644 index e11958e4b..000000000 --- a/Assets/ResWork/UI/Res/menu_kettle.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 91c4f861c6079aa4f8b8c2da307d96c1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_manage.png b/Assets/ResWork/UI/Res/menu_manage.png deleted file mode 100644 index 900bda3df..000000000 Binary files a/Assets/ResWork/UI/Res/menu_manage.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_manage.png.meta b/Assets/ResWork/UI/Res/menu_manage.png.meta deleted file mode 100644 index 45d8db787..000000000 --- a/Assets/ResWork/UI/Res/menu_manage.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: ff22fa6986967414e90484612fd27fdb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_myfarm.png b/Assets/ResWork/UI/Res/menu_myfarm.png deleted file mode 100644 index 3ca506f49..000000000 Binary files a/Assets/ResWork/UI/Res/menu_myfarm.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_myfarm.png.meta b/Assets/ResWork/UI/Res/menu_myfarm.png.meta deleted file mode 100644 index cbe56ed45..000000000 --- a/Assets/ResWork/UI/Res/menu_myfarm.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: f4d787bad4e2f2144a2e560a680a146a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_pet.png b/Assets/ResWork/UI/Res/menu_pet.png deleted file mode 100644 index 885aac678..000000000 Binary files a/Assets/ResWork/UI/Res/menu_pet.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_pet.png.meta b/Assets/ResWork/UI/Res/menu_pet.png.meta deleted file mode 100644 index dea6c9770..000000000 --- a/Assets/ResWork/UI/Res/menu_pet.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 4639de8b7eff6c7438997270d34699ef -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_shop.png b/Assets/ResWork/UI/Res/menu_shop.png deleted file mode 100644 index 101d713c8..000000000 Binary files a/Assets/ResWork/UI/Res/menu_shop.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_shop.png.meta b/Assets/ResWork/UI/Res/menu_shop.png.meta deleted file mode 100644 index f62d48095..000000000 --- a/Assets/ResWork/UI/Res/menu_shop.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: a83796642fdb351498d4da0ecf11d246 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UI/Res/menu_witch.png b/Assets/ResWork/UI/Res/menu_witch.png deleted file mode 100644 index 027ec22d6..000000000 Binary files a/Assets/ResWork/UI/Res/menu_witch.png and /dev/null differ diff --git a/Assets/ResWork/UI/Res/menu_witch.png.meta b/Assets/ResWork/UI/Res/menu_witch.png.meta deleted file mode 100644 index 1dc39b090..000000000 --- a/Assets/ResWork/UI/Res/menu_witch.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: 77321645930345d488d93b379ea2f452 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - 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: 3 - 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: 3 - 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: 3 - buildTarget: Server - 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: 3 - 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: 3 - buildTarget: iPhone - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab b/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab deleted file mode 100644 index 566509b98..000000000 --- a/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab +++ /dev/null @@ -1,2081 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &102714708585032381 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3300922338491370903} - - component: {fileID: 6824949887418167402} - - component: {fileID: 7288751768432599707} - - component: {fileID: 5405430037272898896} - - component: {fileID: 2188023467774786218} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3300922338491370903 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102714708585032381} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: -246, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6824949887418167402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102714708585032381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 11 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 35 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: -7 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.16078432, g: 0.87843144, b: 0.6117647, a: 1} - mPivot: 4 - mWidth: 24 - mHeight: 24 - mDepth: 2 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: exmark - mFixedAspect: 0 - mFillCenter: 1 ---- !u!65 &7288751768432599707 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102714708585032381} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 60, y: 60, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &5405430037272898896 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102714708585032381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} - m_Name: - m_EditorClassIdentifier: - onHoverOver: [] - onHoverOut: [] - onPress: [] - onRelease: [] - onSelect: [] - onDeselect: [] - onClick: - - mTarget: {fileID: 3071942409522450244} - mMethodName: OnClick_ChapterDropInfo - mParameters: [] - oneShot: 0 - onDoubleClick: [] - onDragStart: [] - onDragEnd: [] - onDragOver: [] - onDragOut: [] - onDrag: [] ---- !u!114 &2188023467774786218 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102714708585032381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d345b0a7677bc0499d4d92888f142c3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &124348629908956937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6129932398684922931} - - component: {fileID: 4539891061782751704} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6129932398684922931 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 124348629908956937} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4539891061782751704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 124348629908956937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.16078432, g: 0.8784314, b: 0.6117647, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &518264341049438221 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2316277197695686600} - - component: {fileID: 6861118608352515190} - m_Layer: 5 - m_Name: noti_newchapter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2316277197695686600 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518264341049438221} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 76, y: 95, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6861118608352515190 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518264341049438221} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 22 - mHeight: 20 - mDepth: 5 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.1 - mType: 0 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: mark_exclamation - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &594889020054407123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2769018140247844349} - - component: {fileID: 6995299576399296776} - m_Layer: 5 - m_Name: noti_chapter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2769018140247844349 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 594889020054407123} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.8, y: -233.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6995299576399296776 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 594889020054407123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 22 - mHeight: 20 - mDepth: 5 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.1 - mType: 0 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: mark_exclamation - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &630311544744463567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1574465781681651668} - - component: {fileID: 3341954679489496868} - m_Layer: 5 - m_Name: Sprite (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1574465781681651668 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630311544744463567} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 68, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3341954679489496868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630311544744463567} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &928312647028728401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6324170095576431780} - - component: {fileID: 8196136854721386375} - m_Layer: 5 - m_Name: Sprite (9) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6324170095576431780 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 928312647028728401} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 153, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8196136854721386375 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 928312647028728401} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &1483330579721079143 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2719194116130206843} - - component: {fileID: 9016226722542655581} - m_Layer: 5 - m_Name: Label (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2719194116130206843 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483330579721079143} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -211.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9016226722542655581 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483330579721079143} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 154 - mHeight: 32 - mDepth: 1 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 4.8125 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: b82558c03923de54da84da7ff79cd9f1, type: 3} - mText: "\uD574\uC801\uB3C4\uC2DC \uD558\uBC14\uB098" - mFontSize: 22 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 10 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 ---- !u!1 &3174819455719404325 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 627651486634979999} - - component: {fileID: 5372395113233742027} - m_Layer: 5 - m_Name: curchapter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &627651486634979999 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174819455719404325} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 62, y: 89, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5372395113233742027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174819455719404325} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 50 - mHeight: 38 - mDepth: 4 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.3157895 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: checkmark - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &3476815675268645268 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2737854303286310100} - - component: {fileID: 5462046529313098674} - - component: {fileID: 1425497445405526523} - - component: {fileID: 4305624432532923549} - - component: {fileID: 2689910063233368051} - - component: {fileID: 3795797294556492134} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2737854303286310100 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5462046529313098674 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 176 - mHeight: 216 - mDepth: 2 - mMat: {fileID: 0} - autoResizeBoxCollider: 1 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.8148148 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: selectchapter_1 - mFixedAspect: 0 - mFillCenter: 1 ---- !u!65 &1425497445405526523 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 176, y: 216, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &4305624432532923549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} - m_Name: - m_EditorClassIdentifier: - onHoverOver: [] - onHoverOut: [] - onPress: [] - onRelease: [] - onSelect: [] - onDeselect: [] - onClick: - - mTarget: {fileID: 3071942409522450244} - mMethodName: OnClick_GoChapter - mParameters: [] - oneShot: 0 - onDoubleClick: [] - onDragStart: [] - onDragEnd: [] - onDragOver: [] - onDragOut: [] - onDrag: [] ---- !u!114 &2689910063233368051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d345b0a7677bc0499d4d92888f142c3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3795797294556492134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3476815675268645268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} - m_Name: - m_EditorClassIdentifier: - scrollView: {fileID: 0} - draggablePanel: {fileID: 0} ---- !u!1 &4059996139155010720 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 718055482724220447} - - component: {fileID: 4678103308313699621} - m_Layer: 5 - m_Name: Sprite (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &718055482724220447 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4059996139155010720} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 17, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4678103308313699621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4059996139155010720} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &4171087624881506056 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6107846726436430336} - - component: {fileID: 862521305660859326} - m_Layer: 5 - m_Name: Sprite (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6107846726436430336 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4171087624881506056} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 136, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &862521305660859326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4171087624881506056} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &4528518867869331094 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1027713712042326212} - - component: {fileID: 7748877309993102562} - - component: {fileID: 4146794139304464929} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1027713712042326212 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4528518867869331094} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1894688480875982188} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7748877309993102562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4528518867869331094} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 70 - mHeight: 74 - mDepth: 3 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.9459459 - mType: 0 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: arrow_big - mFixedAspect: 0 - mFillCenter: 1 ---- !u!114 &4146794139304464929 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4528518867869331094} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d166255cacf07b4292b8402b3ddefc5, type: 3} - m_Name: - m_EditorClassIdentifier: - method: 0 - style: 2 - animationCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - ignoreTimeScale: 1 - delay: 0 - duration: 0.5 - steeperCurves: 0 - tweenGroup: 0 - useFixedUpdate: 0 - onFinished: [] - eventReceiver: {fileID: 0} - callWhenFinished: - from: {x: 0, y: 0, z: 0} - to: {x: 0, y: -10, z: 0} - worldSpace: 0 ---- !u!1 &5570567548238747632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1894688480875982188} - m_Layer: 5 - m_Name: GuideArrow_questbtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1894688480875982188 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5570567548238747632} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 134, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1027713712042326212} - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5651514268244978318 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1701471424448214734} - - component: {fileID: 6256909210414665416} - m_Layer: 5 - m_Name: Sprite (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1701471424448214734 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5651514268244978318} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 85, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6256909210414665416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5651514268244978318} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &5762033590265840883 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7894806237386353542} - - component: {fileID: 4369739371644610613} - m_Layer: 5 - m_Name: Sprite (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7894806237386353542 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5762033590265840883} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 102, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4369739371644610613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5762033590265840883} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &6525568039615845518 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6409939764178712779} - - component: {fileID: 3632065400040216410} - - component: {fileID: 2240940973018745721} - - component: {fileID: 3735714324016399155} - m_Layer: 5 - m_Name: notopen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6409939764178712779 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6525568039615845518} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3632065400040216410 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6525568039615845518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.13333334, g: 0.23137257, b: 0.32941177, a: 0.5882353} - mPivot: 4 - mWidth: 176 - mHeight: 216 - mDepth: 3 - mMat: {fileID: 0} - autoResizeBoxCollider: 1 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.8148148 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg_round - mFixedAspect: 0 - mFillCenter: 1 ---- !u!65 &2240940973018745721 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6525568039615845518} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 176, y: 216, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &3735714324016399155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6525568039615845518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} - m_Name: - m_EditorClassIdentifier: - scrollView: {fileID: 0} - draggablePanel: {fileID: 0} ---- !u!1 &7711798176610678892 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3397881095465405718} - - component: {fileID: 4685717664839344695} - m_Layer: 5 - m_Name: Sprite (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3397881095465405718 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7711798176610678892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 34, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4685717664839344695 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7711798176610678892} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &7755900310790998709 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8631037203580636007} - - component: {fileID: 3071942409522450244} - m_Layer: 5 - m_Name: ChapterSelectCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8631037203580636007 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7755900310790998709} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5257955296099494847} - - {fileID: 2737854303286310100} - - {fileID: 6409939764178712779} - - {fileID: 4710429083971964049} - - {fileID: 2719194116130206843} - - {fileID: 627651486634979999} - - {fileID: 3300922338491370903} - - {fileID: 2769018140247844349} - - {fileID: 2316277197695686600} - - {fileID: 1894688480875982188} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3071942409522450244 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7755900310790998709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f202a403a6de0bb4dafc9cc032008b7d, type: 3} - m_Name: - m_EditorClassIdentifier: - sprite_chapter: {fileID: 5462046529313098674} - label_chapter: {fileID: 1467334935151097871} - label_chaptername: {fileID: 9016226722542655581} - gos: - - {fileID: 6525568039615845518} - - {fileID: 3174819455719404325} - - {fileID: 594889020054407123} - - {fileID: 518264341049438221} - - {fileID: 5570567548238747632} - sprites_clear: - - {fileID: 4539891061782751704} - - {fileID: 4678103308313699621} - - {fileID: 4685717664839344695} - - {fileID: 6421223779916976463} - - {fileID: 3341954679489496868} - - {fileID: 6256909210414665416} - - {fileID: 4369739371644610613} - - {fileID: 5191981461002162324} - - {fileID: 862521305660859326} - - {fileID: 8196136854721386375} ---- !u!1 &7896076566028043874 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3039520861257855662} - - component: {fileID: 5191981461002162324} - m_Layer: 5 - m_Name: Sprite (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3039520861257855662 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896076566028043874} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5191981461002162324 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896076566028043874} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &8081267388796476784 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6182474226819599129} - - component: {fileID: 6421223779916976463} - m_Layer: 5 - m_Name: Sprite (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6182474226819599129 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8081267388796476784} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 51, y: -0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4710429083971964049} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6421223779916976463 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8081267388796476784} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.23137255, g: 0.29411766, b: 0.3882353, a: 1} - mPivot: 4 - mWidth: 15 - mHeight: 23 - mDepth: 0 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.65217394 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - mAtlas: {fileID: 11400000, guid: 63ad6f09e0344224e909e7c47f62184c, type: 2} - mSpriteName: whitebg - mFixedAspect: 0 - mFillCenter: 1 ---- !u!1 &8555368573014471878 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5257955296099494847} - - component: {fileID: 1467334935151097871} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5257955296099494847 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555368573014471878} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -175.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1467334935151097871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8555368573014471878} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 - mWidth: 92 - mHeight: 32 - mDepth: 1 - mMat: {fileID: 0} - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2.875 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 3996657457383321757, guid: feff4de29c2271246b6a440e961eaabf, type: 3} - mText: "<\uCC55\uD130 1>" - mFontSize: 22 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 10 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mOverflowEllipsis: 0 - mOverflowWidth: 0 - mOverflowHeight: 0 - mModifier: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 ---- !u!1 &8750270519976068645 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4710429083971964049} - - component: {fileID: 79879907213212274} - m_Layer: 5 - m_Name: StageClear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4710429083971964049 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8750270519976068645} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -76.3, y: -136, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6129932398684922931} - - {fileID: 718055482724220447} - - {fileID: 3397881095465405718} - - {fileID: 6182474226819599129} - - {fileID: 1574465781681651668} - - {fileID: 1701471424448214734} - - {fileID: 7894806237386353542} - - {fileID: 3039520861257855662} - - {fileID: 6107846726436430336} - - {fileID: 6324170095576431780} - m_Father: {fileID: 8631037203580636007} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &79879907213212274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8750270519976068645} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} - m_Name: - m_EditorClassIdentifier: - arrangement: 0 - sorting: 0 - pivot: 3 - maxPerLine: 0 - cellWidth: 17 - cellHeight: 200 - animateSmoothly: 0 - hideInactive: 1 - keepWithinPanel: 0 - sorted: 0 diff --git a/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab.meta b/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab.meta deleted file mode 100644 index 579206833..000000000 --- a/Assets/ResWork/UIPrefabs/Center/ChapterSelectCard.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f378da8ba02d3f2439f87ad22d5d7549 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Title/Tables.prefab b/Assets/ResWork/UIPrefabs/Title/Tables.prefab index 6d82a8d3a..fbb0eddee 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -46,10 +46,8 @@ GameObject: - component: {fileID: 5443754469804314174} - component: {fileID: -8997717719776101203} - component: {fileID: 8621807785527626712} + - component: {fileID: -6935173719014966727} - component: {fileID: -3566230038207785956} - - component: {fileID: 8953827525540970329} - - component: {fileID: 5648831148627508304} - - component: {fileID: -3515070697352216633} - component: {fileID: 6589233753258620715} - component: {fileID: -8554978397079698689} - component: {fileID: -6303332850314313581} @@ -68,7 +66,6 @@ GameObject: - component: {fileID: 8336571791487988917} - component: {fileID: 6191931672819062764} - component: {fileID: 3622786898951503231} - - component: {fileID: 1945925107405883718} - component: {fileID: -4383278693134355230} - component: {fileID: 3149704813866008907} - component: {fileID: 7536875836770088219} @@ -581,6 +578,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: bad4104dcfab8eb448bdc77f64cc73f0, type: 3} +--- !u!114 &-6935173719014966727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043163894663193716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bc6db57c4fd6b04a92ce3925e4bd2fe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_json: {fileID: 4900000, guid: 51efd81c7a03d1443a7a9a52f07d826d, type: 3} --- !u!114 &-3566230038207785956 MonoBehaviour: m_ObjectHideFlags: 0 @@ -594,45 +604,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: 2ee6f5e510e7a684abff53da93f85ef5, type: 3} ---- !u!114 &8953827525540970329 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043163894663193716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e075b8eb331845148b77a30eb566fe05, type: 3} - m_Name: - m_EditorClassIdentifier: - m_json: {fileID: 4900000, guid: ee6dfb0e49477a241bd1e825bf7b0237, type: 3} ---- !u!114 &5648831148627508304 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043163894663193716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b6ed6a6f8b022e947845d776a879a207, type: 3} - m_Name: - m_EditorClassIdentifier: - m_json: {fileID: 4900000, guid: ce8fe8425e5836f48a83cc6f060b1683, type: 3} ---- !u!114 &-3515070697352216633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043163894663193716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2e8230bf95c67048aab816839ec613a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_json: {fileID: 4900000, guid: 92b1411bbe8f7964b8634eb1ba50862a, type: 3} --- !u!114 &6589233753258620715 MonoBehaviour: m_ObjectHideFlags: 0 @@ -868,19 +839,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: a5ab5674074855343b05eefa160412bc, type: 3} ---- !u!114 &1945925107405883718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043163894663193716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1c487698f893674a8098961f92c537f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_json: {fileID: 4900000, guid: be09be07a7b454848becb70fa1fbcc9e, type: 3} --- !u!114 &-4383278693134355230 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index eff41b0e9..6884f9d14 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -2044,7 +2044,7 @@ public class Actor : MyCoroutine if (m_Auto) { IsStop = false; - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.AutoMagic); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.AutoMagic); } else { diff --git a/Assets/Script/Character/Object/CarActor.cs b/Assets/Script/Character/Object/CarActor.cs index 13f13a89a..5e96a9596 100644 --- a/Assets/Script/Character/Object/CarActor.cs +++ b/Assets/Script/Character/Object/CarActor.cs @@ -57,7 +57,7 @@ public class CarActor : Actor MyValue.MyPC.Del_Target(); Set_Outline(false); } - GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem, objtype = m_CarType }); + //GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem, objtype = m_CarType }); } } diff --git a/Assets/Script/Character/PC/WizardActor.cs b/Assets/Script/Character/PC/WizardActor.cs index 0bbab7490..2fb4fb686 100644 --- a/Assets/Script/Character/PC/WizardActor.cs +++ b/Assets/Script/Character/PC/WizardActor.cs @@ -32,7 +32,7 @@ public class WizardActor : PCActor #if UNITY_EDITOR if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "StatTest") return; #endif - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.JoystickAttack); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.JoystickAttack); } private void OnTriggerEnter(Collider other) diff --git a/Assets/Script/Character/PCActor.cs b/Assets/Script/Character/PCActor.cs index cf98d3139..23a16e79d 100644 --- a/Assets/Script/Character/PCActor.cs +++ b/Assets/Script/Character/PCActor.cs @@ -443,7 +443,7 @@ public class PCActor : MyActor { base.Set_Die(); ActorInfo.Ins.All_Stop(true); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.DieOrQuit); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.DieOrQuit); DungeonInfo.Ins.Sub_WaveLife(); MonsterSimpleInfo.Ins.Set_DelLockTarget(true); } diff --git a/Assets/Script/DropItem/DropItem.cs b/Assets/Script/DropItem/DropItem.cs index 19b02db01..bd53bb230 100644 --- a/Assets/Script/DropItem/DropItem.cs +++ b/Assets/Script/DropItem/DropItem.cs @@ -125,7 +125,7 @@ public class DropItem : ProjectileBase InGameInfo.Ins.Show_Effect("Effect_GetCoin", transform.position); gameObject.SetActive(false); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetDropItem); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetDropItem); return true; } } diff --git a/Assets/Script/Info/InGameTouchInfo.cs b/Assets/Script/Info/InGameTouchInfo.cs index 26d974469..a3609db0a 100644 --- a/Assets/Script/Info/InGameTouchInfo.cs +++ b/Assets/Script/Info/InGameTouchInfo.cs @@ -68,20 +68,6 @@ public class InGameTouchInfo : MonoBehaviourSingletonTemplate //ToastUI.Ins.Set("기억의 던전에서 갈 수 없던 곳이 오픈되었다."); } break; - case "FireOff": - if (Vector3.Distance(MyValue.MyPC.Get_position(), hits[i].transform.position) < 5f) - { - hits[i].transform.gameObject.SetActive(false); - GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem, objtype = ChapterQuestObjType.FireOff }); - } - break; - case "Flag": - if (Vector3.Distance(MyValue.MyPC.Get_position(), hits[i].transform.position) < 5f) - { - hits[i].transform.gameObject.SetActive(false); - GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.GetItem, objtype = ChapterQuestObjType.Flag }); - } - break; case "Stone": if (hits[i].collider.GetComponent() != null) MyValue.MyPC.Change_Target(true, hits[i].collider.GetComponent()); diff --git a/Assets/Script/Info/OptionInfo.cs b/Assets/Script/Info/OptionInfo.cs index 7a89e5189..c0a781e04 100644 --- a/Assets/Script/Info/OptionInfo.cs +++ b/Assets/Script/Info/OptionInfo.cs @@ -262,11 +262,6 @@ public class OptionInfo : MonoBehaviourSingletonTemplateBackKeyAdd { if (!string.IsNullOrEmpty(coupon)) { -#if UNITY_ANDROID - if (coupon.Equals("작은마녀")) - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.Coupon); -#endif - var sinfo = ServerInfo.Ins; sinfo.Use_Coupon(coupon, (error, result) => { diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 000f7241f..67358c843 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -211,12 +211,6 @@ public partial class ServerData } Mission = new Dictionary>> { { MyValue.arr_Mission[0], new List>() }, { MyValue.arr_Mission[1], new List>() }, { MyValue.arr_Mission[2], new List>() } }; - var d_missions = table_dailymission.Ins.Get_DataList(); - for (int i = 0; i < d_missions.Count; i++) Mission[MyValue.arr_Mission[0]].Add(new List { d_missions[i].n_MissionIndex, 0, 0 }); // ID, 개수, 획득 여부 or 레벨 - var r_missions = table_repeatmission.Ins.Get_DataList(); - for (int i = 0; i < r_missions.Count; i++) Mission[MyValue.arr_Mission[1]].Add(new List { r_missions[i].n_MissionIndex, 0, 0 }); // ID, 개수, 획득 여부 or 레벨 - var a_missions = table_achievementsmission.Ins.Get_DataList(-1); - for (int i = 0; i < a_missions.Count; i++) Mission[MyValue.arr_Mission[2]].Add(new List { a_missions[i].n_MissionIndex, 0, 0 }); // ID, 개수, 획득 여부 or 레벨 var titledata = table_title.Ins.Get_DataList(); Title = new List>(); @@ -1128,30 +1122,30 @@ public partial class ServerData public int Get_MissionCount(string _key, int _id) { return Mission[_key].Find(f => f[0] == _id)[1]; } public bool CanGet_MissionDaily() { - var dm = Mission[MyValue.arr_Mission[0]]; - var tdata = table_dailymission.Ins.Get_DataList(); - for (int i = 0; i < dm.Count; i++) - { - if (dm[i][2] == 0) - { - var purposecount = tdata.Find(f => f.n_MissionIndex == dm[i][0]).n_PurposeCount; - if (dm[i][1] >= purposecount) - return true; - } - } + //var dm = Mission[MyValue.arr_Mission[0]]; + //var tdata = table_dailymission.Ins.Get_DataList(); + //for (int i = 0; i < dm.Count; i++) + //{ + // if (dm[i][2] == 0) + // { + // var purposecount = tdata.Find(f => f.n_MissionIndex == dm[i][0]).n_PurposeCount; + // if (dm[i][1] >= purposecount) + // return true; + // } + //} return false; } public bool CanGet_MissionRepeat() { - var dm = Mission[MyValue.arr_Mission[1]]; - var tdata = table_repeatmission.Ins.Get_DataList(); - for (int i = 0; i < dm.Count; i++) - { - var purposecount = tdata.Find(f => f.n_MissionIndex == dm[i][0]).n_PurposeCount; - var curCount = dm[i][1] - dm[i][2] * purposecount; - if (curCount >= purposecount) - return true; - } + //var dm = Mission[MyValue.arr_Mission[1]]; + //var tdata = table_repeatmission.Ins.Get_DataList(); + //for (int i = 0; i < dm.Count; i++) + //{ + // var purposecount = tdata.Find(f => f.n_MissionIndex == dm[i][0]).n_PurposeCount; + // var curCount = dm[i][1] - dm[i][2] * purposecount; + // if (curCount >= purposecount) + // return true; + //} return false; } public int Get_AchiCount(int _missionid) @@ -1203,18 +1197,18 @@ public partial class ServerData } public bool CanGet_MissionAchi(int chapter) { - var dm = Mission[MyValue.arr_Mission[2]]; - var t_achi = table_achievementsmission.Ins.Get_DataList(chapter); - for (int i = 0; i < t_achi.Count; i++) - { - var mdata = dm.Find(f => f[0] == t_achi[i].n_MissionIndex); - if (mdata[2] < 1) - { - var tabledata = t_achi[i]; - if (Get_AchiCount(t_achi[i].n_MissionIndex) >= tabledata.n_PurposeCount) - return true; - } - } + //var dm = Mission[MyValue.arr_Mission[2]]; + //var t_achi = table_achievementsmission.Ins.Get_DataList(chapter); + //for (int i = 0; i < t_achi.Count; i++) + //{ + // var mdata = dm.Find(f => f[0] == t_achi[i].n_MissionIndex); + // if (mdata[2] < 1) + // { + // var tabledata = t_achi[i]; + // if (Get_AchiCount(t_achi[i].n_MissionIndex) >= tabledata.n_PurposeCount) + // return true; + // } + //} return false; } int Get_EquipmentObtainCount(int type, int minid, int maxid) diff --git a/Assets/Script/Table/Mission/table_achievementsmission.cs b/Assets/Script/Table/Mission/table_achievementsmission.cs deleted file mode 100644 index ca7ed3704..000000000 --- a/Assets/Script/Table/Mission/table_achievementsmission.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - -public class table_achievementsmission : table_missionbase -{ - public static table_achievementsmission Ins; - List tableDatas; - - protected override void Awake() - { - base.Awake(); - Ins = this; - } - - protected override void Start() - { - tableDatas = JsonConvert.DeserializeObject>(json_last); - for (int i = 0; i < tableDatas.Count; i++) - { - tableDatas[i].MissionType = 2; - } - - base.Start(); - } - - public List Get_DataList(int chapter) - { - if (chapter < 0) return tableDatas; - return tableDatas.FindAll(f => f.Chapter == chapter); - } -} \ No newline at end of file diff --git a/Assets/Script/Table/Mission/table_dailymission.cs b/Assets/Script/Table/Mission/table_dailymission.cs deleted file mode 100644 index b597677e5..000000000 --- a/Assets/Script/Table/Mission/table_dailymission.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - - -public class table_dailymission : table_missionbase -{ - public static table_dailymission Ins; - List tableDatas; - - protected override void Awake() - { - base.Awake(); - Ins = this; - } - - protected override void Start() - { - tableDatas = JsonConvert.DeserializeObject>(json_last); - for (int i = 0; i < tableDatas.Count; i++) - { - tableDatas[i].MissionType = 0; - } - - base.Start(); - } - - public List Get_DataList() { return tableDatas; } -} \ No newline at end of file diff --git a/Assets/Script/Table/Mission/table_dailymission.cs.meta b/Assets/Script/Table/Mission/table_dailymission.cs.meta deleted file mode 100644 index 66fe970b8..000000000 --- a/Assets/Script/Table/Mission/table_dailymission.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e075b8eb331845148b77a30eb566fe05 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/Table/Mission/table_guidequest.cs b/Assets/Script/Table/Mission/table_guidequest.cs deleted file mode 100644 index edd067af5..000000000 --- a/Assets/Script/Table/Mission/table_guidequest.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - -public class GuideQuestTableData : MissionTableData -{ - public string Target, TargetSub; -} - -public class table_guidequest : table_missionbase -{ - public static table_guidequest Ins; - List tableDatas; - Dictionary dic_Data = new Dictionary(); - - protected override void Awake() - { - base.Awake(); - Ins = this; - } - - protected override void Start() - { - tableDatas = JsonConvert.DeserializeObject>(json_last); - for (int i = 0; i < Get_DataList().Count; i++) - { - var temp = Get_DataList()[i]; - dic_Data.Add(temp.n_MissionIndex, temp); - } - - base.Start(); - } - - public List Get_DataList() { return tableDatas; } - - public GuideQuestTableData Get_Data(int _id) - { - if (dic_Data.ContainsKey(_id)) return dic_Data[_id]; - return tableDatas[tableDatas.Count - 1]; - } -} \ No newline at end of file diff --git a/Assets/Script/Table/Mission/table_guidequest.cs.meta b/Assets/Script/Table/Mission/table_guidequest.cs.meta deleted file mode 100644 index ffea574c9..000000000 --- a/Assets/Script/Table/Mission/table_guidequest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c1c487698f893674a8098961f92c537f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/Table/Mission/table_missionbase.cs b/Assets/Script/Table/Mission/table_missionbase.cs index 492c24451..3f9826391 100644 --- a/Assets/Script/Table/Mission/table_missionbase.cs +++ b/Assets/Script/Table/Mission/table_missionbase.cs @@ -1,68 +1,5 @@ -using System; -using CodeStage.AntiCheat.ObscuredTypes; using UnityEngine; -[Serializable] -public class MissionTableData : TableDataBase -{ - ObscuredInt _MissionIndex; - public int n_MissionIndex - { - get { return _MissionIndex; } - set { _MissionIndex = value; _MissionIndex.RandomizeCryptoKey(); } - } // 미션 별 고유 인덱스 - - public ePurpose e_Purpose; // 미션 달성 조건을 결정하기 위한 Enum 값 - - ObscuredInt _PurposeCount; - public int n_PurposeCount - { - get { return _PurposeCount; } - set { _PurposeCount = value; _PurposeCount.RandomizeCryptoKey(); } - } // 미션 달성 조건에 필요한 조건 수량 - - public eItem e_Reward; // 보상으로 지급 될 아이템의 타입 - - ObscuredInt _RewardID; - public int n_RewardID - { - get { return _RewardID; } - set { _RewardID = value; _RewardID.RandomizeCryptoKey(); } - } // 보상으로 지급 될 아이템의 ID 또는 설정 값 - - ObscuredInt _RewardAmount; - public int n_RewardAmount - { - get { return _RewardAmount; } - set { _RewardAmount = value; _RewardAmount.RandomizeCryptoKey(); } - } // 보상으로 지급 될 아이템의 수량 - - public bool b_GuideEffectShow; // 미션의 가이드 연출 제공 유무를 제어하기 위한 Bool 값 - - ObscuredInt _Chapter; - public int Chapter - { - get { return _Chapter; } - set { _Chapter = value; _Chapter.RandomizeCryptoKey(); } - } // Chapter 정보 - - ObscuredString _Desc; - public string Desc - { - get { return _Desc; } - set { _Desc = value; _Desc.RandomizeCryptoKey(); } - } // 미션 설명 - - - // 테이블에 없는 값 - ObscuredInt _MissionType; - public int MissionType - { - get { return _MissionType; } - set { _MissionType = value; _MissionType.RandomizeCryptoKey(); } - } // 미션 타입 (테이블에 없는 추가 값) -} - public class table_missionbase : MonoBehaviour { public TextAsset m_json; diff --git a/Assets/Script/Table/Mission/table_missionlist.cs b/Assets/Script/Table/Mission/table_missionlist.cs new file mode 100644 index 000000000..e5d165406 --- /dev/null +++ b/Assets/Script/Table/Mission/table_missionlist.cs @@ -0,0 +1,97 @@ +using CodeStage.AntiCheat.ObscuredTypes; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using UnityEngine; + +[Serializable] +public class MissionListTableData : TableDataBase +{ + protected ObscuredInt _MissionIndex; + public int n_MissionIndex + { + get { return _MissionIndex; } + set { _MissionIndex = value; _MissionIndex.RandomizeCryptoKey(); } + } + + protected ObscuredInt _MissionGroupId; + public int n_MissionGroupId + { + get { return _MissionGroupId; } + set { _MissionGroupId = value; _MissionGroupId.RandomizeCryptoKey(); } + } + + public string s_LinkedQuestType; + public string n_MissionDesc; + public ePurpose e_MissionConditionType; + + protected ObscuredInt _MissionConditionValue; + public int n_MissionConditionValue + { + get { return _MissionConditionValue; } + set { _MissionConditionValue = value; _MissionConditionValue.RandomizeCryptoKey(); } + } + + protected ObscuredLong _MissionConditionCount; + public long l_MissionConditionCount + { + get { return _MissionConditionCount; } + set { _MissionConditionCount = value; _MissionConditionCount.RandomizeCryptoKey(); } + } + + //protected ObscuredInt _RewardType; + //public int e_RewardType + //{ + // get { return _RewardType; } + // set { _RewardType = value; _RewardType.RandomizeCryptoKey(); } + //} + + protected ObscuredInt _RewardValue; + public int n_RewardValue + { + get { return _RewardValue; } + set { _RewardValue = value; _RewardValue.RandomizeCryptoKey(); } + } + + protected ObscuredInt _RewardCount; + public int n_RewardCount + { + get { return _RewardCount; } + set { _RewardCount = value; _RewardCount.RandomizeCryptoKey(); } + } + + public bool b_RepeatMission; +} + +public class table_missionlist : table_missionbase +{ + public static table_missionlist Ins; + List tableDatas; + Dictionary> dic_datas = new Dictionary>(); + + protected override void Awake() + { + base.Awake(); + Ins = this; + } + + protected override void Start() + { + tableDatas = JsonConvert.DeserializeObject>(json_last); + + for (int i = 0; i < Get_DataList().Count; i++) + { + //var temp = Get_DataList()[i]; + //var itemtype = temp.e_ItemType; + //if (!dic_itemlist.ContainsKey(itemtype)) + // dic_itemlist.Add(itemtype, new List()); + //dic_itemlist[itemtype].Add(temp); + //dic_items.Add(temp.n_ItemID, temp); + } + + base.Start(); + } + + public List Get_DataList() { return tableDatas; } + public List Get_DataList(int group) { return dic_datas[group]; } +} \ No newline at end of file diff --git a/Assets/Script/Table/Mission/table_achievementsmission.cs.meta b/Assets/Script/Table/Mission/table_missionlist.cs.meta similarity index 83% rename from Assets/Script/Table/Mission/table_achievementsmission.cs.meta rename to Assets/Script/Table/Mission/table_missionlist.cs.meta index 4b2668d86..5771d3eb0 100644 --- a/Assets/Script/Table/Mission/table_achievementsmission.cs.meta +++ b/Assets/Script/Table/Mission/table_missionlist.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2e8230bf95c67048aab816839ec613a +guid: 8bc6db57c4fd6b04a92ce3925e4bd2fe MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/Table/Mission/table_repeatmission.cs b/Assets/Script/Table/Mission/table_repeatmission.cs deleted file mode 100644 index fef492dc9..000000000 --- a/Assets/Script/Table/Mission/table_repeatmission.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - - -public class table_repeatmission : table_missionbase -{ - public static table_repeatmission Ins; - List tableDatas; - - protected override void Awake() - { - base.Awake(); - Ins = this; - } - - protected override void Start() - { - tableDatas = JsonConvert.DeserializeObject>(json_last); - for (int i = 0; i < tableDatas.Count; i++) - { - tableDatas[i].MissionType = 1; - } - - base.Start(); - } - - public List Get_DataList() { return tableDatas; } -} \ No newline at end of file diff --git a/Assets/Script/Table/Mission/table_repeatmission.cs.meta b/Assets/Script/Table/Mission/table_repeatmission.cs.meta deleted file mode 100644 index c1dabfb5c..000000000 --- a/Assets/Script/Table/Mission/table_repeatmission.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b6ed6a6f8b022e947845d776a879a207 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs b/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs deleted file mode 100644 index 77a894d86..000000000 --- a/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ChapterSelectCard : CardBase -{ - public UISprite sprite_chapter; - public UILabel label_chapter, label_chaptername; - public GameObject[] gos; // 0 오픈여부, 1 선택된 챕터, 2 챕퀘노티, 3 new챕터 - public UISprite[] sprites_clear; - - ChapterTextTableData m_ChapterTextTableData; - bool isClick = false; - - public override void Set(T _base) - { - isClick = false; - - base.Set(_base); - m_ChapterTextTableData = _base as ChapterTextTableData; - sprite_chapter.spriteName = DSUtil.Format("selectchapter_{0}", m_ChapterTextTableData.ID); - - var sdata = ServerInfo.Ins.m_ServerData; - bool isNoOpen = true;// sdata.Get_Common(eCommon.MaxMapID) < m_ChapterTextTableData.ID; - - // 오픈 되지 않았다. - // 1. 그림 흐리게 - // 2. <챕터> 색깔 흐리게 - // 3. 챕터 이름 흐리게 - if (isNoOpen) - { - DSUtil.InActivateGameObjects(gos, 0); - label_chapter.text = DSUtil.Format("[0D2137]<챕터 {0}>", m_ChapterTextTableData.ID); - label_chaptername.text = DSUtil.Format("[0D2137]{0}", m_ChapterTextTableData.ChapterName); - for (int i = 0; i < sprites_clear.Length; i++) - sprites_clear[i].color = new Color32(13, 33, 55, 255); - } - else - { - //bool isClearChapter = sdata.Get_Common(eCommon.MaxMapID, true) > m_ChapterTextTableData.ID; - //int maxstage = 0; - //if (isClearChapter) - // maxstage = 10; - //else if (sdata.Get_Common(eCommon.MaxMapID) == m_ChapterTextTableData.ID) - // maxstage = sdata.Get_Common(eCommon.MaxStage); - - //gos[0].SetActive(false); - //gos[1].SetActive(m_ChapterTextTableData.ID == sdata.Get_Common(eCommon.Chapter)); - gos[2].SetActive(sdata.IsCanGetChapterClearReward(m_ChapterTextTableData.ID)); - gos[3].SetActive(DataCheckMgr.Ins.NewChapter == m_ChapterTextTableData.ID); - gos[4].SetActive(m_ChapterTextTableData.ID > 1 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChapterChange && sdata.Get_Common(eCommon.GuideClear) == 0); - label_chapter.text = DSUtil.Format("<챕터 {0}>", m_ChapterTextTableData.ID); - label_chaptername.text = DSUtil.Format("[28FFAF]{0}", m_ChapterTextTableData.ChapterName); - for (int i = 0; i < sprites_clear.Length; i++) - { - //if (i < maxstage) - // sprites_clear[i].color = new Color32(41, 224, 156, 255); - //else - // sprites_clear[i].color = new Color32(13, 33, 55, 255); - } - } - } - - public void OnClick_GoChapter() - { - if (!isClick) - { - isClick = true; - //ServerInfo.Ins.m_ServerData.Set_Common(eCommon.BeforeChapter, m_ChapterTextTableData.ID); - GameUI.Ins.LobbyUI.Get_MenuChapter().Go_SelectChapter(m_ChapterTextTableData.ID, false); - GameUI.Ins.LobbyUI.Get_ChapterSelect().OnClick_Back(); - if (DataCheckMgr.Ins.NewChapter == m_ChapterTextTableData.ID) - { - DataCheckMgr.Ins.NewChapter = 0; - GameUI.Ins.LobbyUI.Set_Noti(); - } - if (m_ChapterTextTableData.ID > 1) - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ChapterChange); - } - } - - public void OnClick_ChapterDropInfo() - { - GameUI.Ins.LobbyUI.Get_MenuChapter().m_ChapterDropInfo.Set(m_ChapterTextTableData.ID); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs.meta b/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs.meta deleted file mode 100644 index b44ab36fc..000000000 --- a/Assets/Script/UI/Center/Chapter/ChapterSelectCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f202a403a6de0bb4dafc9cc032008b7d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/EquipmentInfoUI.cs b/Assets/Script/UI/Center/EquipmentInfoUI.cs deleted file mode 100644 index 519e62463..000000000 --- a/Assets/Script/UI/Center/EquipmentInfoUI.cs +++ /dev/null @@ -1,319 +0,0 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EquipmentInfoUI : MonoBehaviour -{ - public UIItemCard m_card; - public UILabel[] labels; // 0 이름, 1 필요 강화석, 2 필요 합성 카드, 3 필요 초월 카드, 4 마법 설명 - public UILabel[] labels_reinforce; // 0 전 lv, 1 후 lv, 2 스탯 이름1, 3 전 스탯1, 4 후 스탯1, 5 스탯 이름2, 6 전 스탯2, 7 후 스탯2 - public UILabel[] labels_transcend; // 0 전 lv, 1 후 lv, 2 스탯 이름, 3 전 스탯, 4 후 스탯 - public UISprite[] sprites; // 0 강화석, 1 2 아이템, 3 초기화 버튼, 4 5 개화 아이콘 - public GameObject[] gos; // 0 강화 스탯2, 1 초월, 2 합성, 3 불가능(강화), 4 불가능(합성), 5 불가능(초월), 6 초월 이펙트, 7 강화석 이펙트, 8 강화 두번째 화살표, 9 초기화 버튼, 10 장착 화살표, 11 합성 화살표, 12 강화 화살표 - public NGUIButtonPress m_NGUIButtonPress; - public MagicBlossomUI m_MagicBlossomUI; - public UILabel[] labels_blossom; // 0 개화1, 1 개화1 필요 갯수, 2 개화2, 3 개화2 필요 갯수 - public GameObject[] gos_blossom; // 0 개화1 불가능, 1 개화2 불가능, 2 개화1 완료, 3 개화2 완료 - public GameObject[] gos_equip; // 0 착용, 1 착용 중, 2 해제 - - UIItemCard m_UIItemCard; - ItemData m_ItemData; - SkillListTableData m_MagicData; - ObscuredInt m_Unit; - ObscuredDouble m_NeedStone; - bool RefreshRight_WhenClose; - - private void Awake() - { - m_NGUIButtonPress.Set_Action(OnClick_Reinforce); - m_card.Set_CardType(eUICardType.DetailInfo); - m_MagicBlossomUI.Check(); - } - - public void Set(UIItemCard _ic, int _unit) - { - m_UIItemCard = _ic; - m_ItemData = _ic.Get_ItemData(); - m_MagicData = _ic.Get_SkillTableData(); - m_Unit = _unit; - RefreshRight_WhenClose = false; - Set_UI(); - Check_GuideQuest(); - } - void Set_UI() - { - m_card.Set(m_ItemData); - var sdata = ServerInfo.Ins.m_ServerData; - var isequip = sdata.IsEquipItem(m_ItemData.Get_ID()); - gos_equip[0].SetActive(m_ItemData.Lv > 0 && !isequip); // 착용 버튼 - gos_equip[1].SetActive(m_ItemData.Lv > 0 && isequip); // 착용 중 - gos_equip[2].SetActive(m_ItemData.Lv > 0 && isequip && m_ItemData.ItemType == eItem.Skill); // 해제 버튼 - gos[2].SetActive(m_ItemData.Grade < eItemGrade.Myth); - gos[4].SetActive(m_ItemData.Lv < 1 || !sdata.Check_ItemAmount(m_ItemData.ItemType, MyValue.arr_NeedMixCount[(int)m_ItemData.Grade], m_ItemData.Get_ID(), false)); - gos[6].SetActive(false); - gos[7].SetActive(false); - labels[0].text = DSUtil.Format("{0}{1}", MyValue.Get_GradeColor((int)m_ItemData.Grade), m_ItemData.Name); - labels[2].text = MyValue.arr_NeedMixCount[(int)m_ItemData.Grade].ToString(); - labels_reinforce[0].text = m_ItemData.Lv.ToString(); - labels_reinforce[1].text = (m_ItemData.Lv + m_Unit).ToString(); - - if (m_ItemData.ItemType == eItem.Skill) - { - for (int i = 0; i < sprites.Length; i++) - sprites[i].spriteName = m_ItemData.IconInfo.Icon; - - //m_NeedStone = m_MagicData.n_LvUpAmount * m_Unit; - labels[1].text = m_NeedStone.ToString(); - gos[3].SetActive(m_ItemData.Lv < 1 || !sdata.Check_ItemAmount(m_ItemData.ItemType, m_NeedStone, m_ItemData.Get_ID(), false)); - gos[9].SetActive(false); - labels[4].text = m_MagicData.Get_SkillDesc(); - - // 강화 - var pcstat = MyValue.Get_ActorStatInfoorNull(eRole.PC); - labels_reinforce[2].text = "마법 효과"; - //labels_reinforce[3].text = DSUtil.Format("{0:#,##0.##}%", m_MagicData.SkillDamage * 100f); - //labels_reinforce[4].text = DSUtil.Format("{0:#,##0.##}%", m_MagicData.Get_SkillDamage(m_ItemData.Lv + m_Unit - 1) * 100f); - labels_reinforce[5].text = "재사용 대기시간"; - labels_reinforce[6].text = DSUtil.Format("{0}(강화불가)", MyText.Get_StatValueText(eStat.COOLTIME_Multiplier, m_MagicData.Get_CoolTime(pcstat.Get_Stat(eStat.COOLTIME_Multiplier)))); - labels_reinforce[7].text = ""; - gos[8].SetActive(false); - - // 개화 - //labels_blossom[0].text = m_MagicData.Get_SkillEnhanceDesc(1); - //labels_blossom[1].text = m_MagicData.Step1Amount.ToString(); - //labels_blossom[2].text = m_MagicData.Get_SkillEnhanceDesc(2); - //labels_blossom[3].text = m_MagicData.Step2Amount.ToString(); - - if (m_ItemData.Lv > 0) - { - gos_blossom[2].SetActive(false); - //if (sdata.Get_SkillStep(m_MagicData.n_SkillID, 1)) - //{ - // gos_blossom[0].SetActive(false); - // gos_blossom[2].SetActive(true); - //} - //else - //gos_blossom[0].SetActive(!sdata.Check_ItemAmount(eItem.Magic, m_MagicData.Step1Amount, m_MagicData.n_SkillID, false)); - - gos_blossom[3].SetActive(false); - //if (sdata.Get_SkillStep(m_MagicData.n_SkillID, 2)) - //{ - // gos_blossom[1].SetActive(false); - // gos_blossom[3].SetActive(true); - //} - //else - //gos_blossom[1].SetActive(!sdata.Check_ItemAmount(eItem.Magic, m_MagicData.Step2Amount, m_MagicData.n_SkillID, false)); - } - else - { - gos_blossom[0].SetActive(true); - gos_blossom[1].SetActive(true); - gos_blossom[2].SetActive(false); - gos_blossom[3].SetActive(false); - } - } - else - { - m_NeedStone = 0d; - for (int i = 0; i < m_Unit; i++) - m_NeedStone += m_ItemData.Get_NeedStoneAmount(i); - - labels[1].text = NumberFormatter.FormatNumber(m_NeedStone); - gos[3].SetActive(m_ItemData.Lv < 1 || !sdata.Check_ItemAmount(DSUtil.Get_StoneType(m_ItemData.ItemType), m_NeedStone, 0, false)); - labels[3].text = MyValue.arr_NeedTranscendCount[(int)m_ItemData.Grade].ToString(); - labels[4].text = ""; - gos[5].SetActive(m_ItemData.Lv < 1 || !sdata.Check_ItemAmount(m_ItemData.ItemType, MyValue.arr_NeedTranscendCount[(int)m_ItemData.Grade], m_ItemData.Get_ID(), false)); - gos[7].transform.localPosition = sprites[0].transform.localPosition; - gos[8].SetActive(true); - gos[9].SetActive(true); - - var statinfo = m_ItemData.Get_StatInfo(); - labels_reinforce[2].text = MyText.Get_StatName(statinfo[0].Stat); - labels_reinforce[3].text = MyText.Get_StatValueText(statinfo[0].Stat, statinfo[0].Get_StatValue(m_ItemData.Lv)); - labels_reinforce[4].text = MyText.Get_StatValueText(statinfo[0].Stat, statinfo[0].Get_StatValue(m_ItemData.Lv + m_Unit)); - if (statinfo[1].Stat < eStat.None) - { - labels_reinforce[5].text = MyText.Get_StatName(statinfo[1].Stat); - labels_reinforce[6].text = MyText.Get_StatValueText(statinfo[1].Stat, statinfo[1].Get_StatValue(m_ItemData.Lv)); - labels_reinforce[7].text = MyText.Get_StatValueText(statinfo[1].Stat, statinfo[1].Get_StatValue(m_ItemData.Lv + m_Unit)); - gos[0].SetActive(true); - } - else - gos[0].SetActive(false); - - labels_transcend[0].text = m_ItemData.TLv.ToString(); - labels_transcend[1].text = (m_ItemData.TLv + 1).ToString(); - labels_transcend[2].text = MyText.Get_EquipmentSpecial(m_ItemData.ItemType, m_ItemData.Get_ID()); - if (m_ItemData.ItemType == eItem.Weapon) - { - gos[1].SetActive(true); - labels_transcend[3].text = DSUtil.Format("{0:0.##}%", statinfo[2].Get_StatValue(m_ItemData.TLv) * 100f); - labels_transcend[4].text = DSUtil.Format("{0:0.##}%", statinfo[2].Get_StatValue(m_ItemData.TLv + 1) * 100f); - } - else - { - if (statinfo[2].Stat < eStat.None) - { - gos[1].SetActive(true); - labels_transcend[3].text = MyText.Get_StatValueText(statinfo[2].Stat, statinfo[2].Get_StatValue(m_ItemData.TLv)); - labels_transcend[4].text = MyText.Get_StatValueText(statinfo[2].Stat, statinfo[2].Get_StatValue(m_ItemData.TLv + 1)); - } - else - gos[1].SetActive(false); - } - - sprites[0].spriteName = DSUtil.Get_ItemSpriteInfo(DSUtil.Get_StoneType(m_ItemData.ItemType)).Icon; - sprites[1].spriteName = sprites[2].spriteName = m_ItemData.IconInfo.Icon; - } - - m_NeedStone.RandomizeCryptoKey(); - } - void Check_GuideQuest() - { - if (gos[10].activeInHierarchy) gos[10].SetActive(false); - if (gos[11].activeInHierarchy) gos[11].SetActive(false); - if (gos[12].activeInHierarchy) gos[12].SetActive(false); - - switch (NewGameUI.Ins.m_GuideQuestUI.Get_Purpose()) - { - case ePurpose.EqiupWeapon: Set_GuideArrow(10, eItem.Weapon, true); break; - case ePurpose.EqiupFairy: Set_GuideArrow(10, eItem.Fairy, true); break; - case ePurpose.EquipMagic: Set_GuideArrow(10, eItem.Skill, true); break; - case ePurpose.MixRing: Set_GuideArrow(11, eItem.Ring, false); break; - case ePurpose.EnchantMagic: Set_GuideArrow(12, eItem.Skill, false); break; - } - } - void Set_GuideArrow(int index, eItem item, bool isequip) - { - if (m_ItemData.Lv > 0 && m_ItemData.ItemType == item && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0) - { - gos[index].SetActive(true); - if (isequip) DSUtil.InActivateGameObjects(gos_equip, 0); - } - } - - public void OnClick_Equip() - { - if (gos[10].activeInHierarchy) gos[10].SetActive(false); - switch (m_ItemData.ItemType) - { - case eItem.Weapon: NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.EqiupWeapon); break; - case eItem.Fairy: NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.EqiupFairy); break; - case eItem.Skill: NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.EquipMagic); break; - } - //ServerInfo.Ins.m_ServerData.Equip.Set_Equip(Content_Equipment.Ins.m_Equipment_Left.m_DeckTabUI.Get_Tab(), m_ItemData.ItemType, m_ItemData.ItemType - eItem.PC, m_ItemData.Get_ID(), 0); - Set_UI(); - Content_Equipment.Ins.m_Equipment_Left.Set_UI(true, true); - } - public void OnClick_UnEquip() - { - //ServerInfo.Ins.m_ServerData.Equip.Set_Equip(Content_Equipment.Ins.m_Equipment_Left.m_DeckTabUI.Get_Tab(), m_ItemData.ItemType, m_ItemData.ItemType - eItem.PC, 0, m_ItemData.Get_ID()); - Set_UI(); - Content_Equipment.Ins.m_Equipment_Left.Set_UI(true, false); - } - public void OnClick_Reinforce() - { - var sdata = ServerInfo.Ins.m_ServerData; - if (m_ItemData.ItemType == eItem.Skill) - { - if (sdata.Check_ItemAmount(eItem.Skill, m_NeedStone, m_MagicData.n_SkillID)) - { - sdata.Use_Item(eItem.Skill, m_NeedStone, m_MagicData.n_SkillID); - sdata.Add_SkillLv(m_MagicData.n_SkillID, m_Unit); - m_ItemData.Lv += m_Unit; - Set_UI(); - gos[7].SetActive(true); - sdata.Add_MissionCount(MyValue.arr_Mission[1], 30); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.EnchantMagic); - SoundInfo.Ins.Play_OneShot(eSound.s018_StoneLvUp); - RefreshRight_WhenClose = true; - gos[12].SetActive(false); - } - } - else - { - var stonetype = DSUtil.Get_StoneType(m_ItemData.ItemType); - if (sdata.Get_SmeltingLv(m_ItemData.Get_ID()) > 0 && sdata.Check_ItemAmount(stonetype, m_NeedStone)) - { - sdata.Use_Item(stonetype, m_NeedStone); - //sdata.Add_SmeltingLv(m_ItemData.ItemType, m_ItemData.Get_ID(), m_Unit); - m_ItemData.Lv += m_Unit; - Set_UI(); - gos[7].SetActive(true); - gos[7].transform.localPosition = Vector3.zero; - SoundInfo.Ins.Play_OneShot(eSound.s018_StoneLvUp); - RefreshRight_WhenClose = true; - } - } - } - public void OnClick_MixAll() - { // 모두합성 (일괄합성 아님) - OnClick_Mix(); - // 오른쪽 맥스 누르고 실행 - GameUI.Ins.LobbyUI.Get_MixPopup().MixAll(); - } - public void OnClick_Mix() - { - GameUI.Ins.LobbyUI.Get_MixPopup().Set(m_UIItemCard, MyValue.arr_NeedMixCount[(int)m_ItemData.Grade]); - } - - public void OnClick_Transcend() - { - var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Get_SmeltingLv(m_ItemData.Get_ID()) > 0 && sdata.Check_ItemAmount(m_ItemData.ItemType, MyValue.arr_NeedTranscendCount[(int)m_ItemData.Grade], m_ItemData.Get_ID())) - { - sdata.Add_MissionCount(MyValue.arr_Mission[1], Get_RepeatMissionID_Transcend()); - sdata.Use_Item(m_ItemData.ItemType, MyValue.arr_NeedTranscendCount[(int)m_ItemData.Grade], m_ItemData.Get_ID()); - sdata.Add_EquipmentTLv(m_ItemData.ItemType, m_ItemData.Get_ID()); - ++m_ItemData.TLv; - Set_UI(); - gos[6].SetActive(true); - gos[6].transform.localPosition = Vector3.zero; - SoundInfo.Ins.Play_OneShot(eSound.s017_Transcend); - RefreshRight_WhenClose = true; - } - } - - int Get_RepeatMissionID_Transcend() { return m_ItemData.ItemType - eItem.Weapon + 23; } - - public void OnClick_ResetReinforce() - { - Content_Equipment.Ins.m_EquipmentReinforceInitPopup.Set(m_ItemData, ()=> - { - Set_UI(); - RefreshRight_WhenClose = true; - }); - } - public void OnClick_Step1() - { - var sdata = ServerInfo.Ins.m_ServerData; - int step = 1; - //if (sdata.Check_ItemAmount(eItem.Magic, m_MagicData.Step1Amount, m_MagicData.n_SkillID) && !sdata.Get_SkillStep(m_MagicData.n_SkillID, step)) - { - //sdata.Use_Item(eItem.Magic, m_MagicData.Step1Amount, m_MagicData.n_SkillID); - sdata.Add_SkillAwakenLv(m_MagicData.n_SkillID); - m_MagicBlossomUI.Set(step, m_MagicData, () => { Set_UI(); RefreshRight_WhenClose = true; }); - } - } - public void OnClick_Step2() - { - var sdata = ServerInfo.Ins.m_ServerData; - int step = 2; - //if (sdata.Check_ItemAmount(eItem.Magic, m_MagicData.Step2Amount, m_MagicData.n_SkillID) && !sdata.Get_SkillStep(m_MagicData.n_SkillID, step)) - { - //sdata.Use_Item(eItem.Magic, m_MagicData.Step2Amount, m_MagicData.n_SkillID); - sdata.Add_SkillAwakenLv(m_MagicData.n_SkillID); - m_MagicBlossomUI.Set(step, m_MagicData, () => { Set_UI(); RefreshRight_WhenClose = true; }); - } - } - - private void OnDisable() - { - if (RefreshRight_WhenClose) - { - RefreshRight_WhenClose = false; - Content_Equipment.Ins.m_Equipment_Left.Set_UI(true, false); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Center/EquipmentInfoUI.cs.meta b/Assets/Script/UI/Center/EquipmentInfoUI.cs.meta deleted file mode 100644 index 43e7079f6..000000000 --- a/Assets/Script/UI/Center/EquipmentInfoUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: acdb7a80a867db3449762669892afaf8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Center/Mission/MissionCard.cs b/Assets/Script/UI/Center/Mission/MissionCard.cs index d7d564e16..1f29ceb0b 100644 --- a/Assets/Script/UI/Center/Mission/MissionCard.cs +++ b/Assets/Script/UI/Center/Mission/MissionCard.cs @@ -1,6 +1,3 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System.Collections; -using System.Collections.Generic; using UnityEngine; public class MissionCard : CardBase @@ -17,14 +14,14 @@ public class MissionCard : CardBase public override void Set(T _base) { base.Set(_base); - var data = _base as MissionTableData; + var data = _base as MissionListTableData; - if (data.MissionType == 0) + if (data.n_MissionGroupId == 0) { m_MissionCard_Achi.enabled = m_MissionCard_Repeat.enabled = false; m_MissionCard_Daily.Set(data); } - else if (data.MissionType == 1) + else if (data.n_MissionGroupId == 1) { m_MissionCard_Achi.enabled = m_MissionCard_Daily.enabled = false; m_MissionCard_Repeat.Set(data); diff --git a/Assets/Script/UI/Center/Mission/MissionCard_Achi.cs b/Assets/Script/UI/Center/Mission/MissionCard_Achi.cs index 602b17045..f05da228f 100644 --- a/Assets/Script/UI/Center/Mission/MissionCard_Achi.cs +++ b/Assets/Script/UI/Center/Mission/MissionCard_Achi.cs @@ -1,11 +1,9 @@ using CodeStage.AntiCheat.ObscuredTypes; -using System.Collections; using System.Collections.Generic; -using UnityEngine; public class MissionCard_Achi : MissionCard { - MissionTableData m_MissionTableData; + MissionListTableData m_MissionTableData; List S_Data; ObscuredInt m_CurCount; @@ -20,7 +18,7 @@ public class MissionCard_Achi : MissionCard labels[3].text = ""; } - public void Set(MissionTableData _base) + public void Set(MissionListTableData _base) { enabled = true; m_MissionTableData = _base; @@ -29,10 +27,10 @@ public class MissionCard_Achi : MissionCard m_CurCount = sdata.Get_AchiCount(_base.n_MissionIndex); m_CurCount.RandomizeCryptoKey(); - sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID).Icon; - labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount); - labels[1].text = m_MissionTableData.Desc; - labels[2].text = DSUtil.Format("{0}/{1}", m_CurCount, m_MissionTableData.n_PurposeCount); + //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID).Icon; + //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount); + //labels[1].text = m_MissionTableData.Desc; + //labels[2].text = DSUtil.Format("{0}/{1}", m_CurCount, m_MissionTableData.n_PurposeCount); go_getbtn.SetActive(false); if (S_Data[2] > 0) @@ -42,40 +40,40 @@ public class MissionCard_Achi : MissionCard } else { - if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount) - { - name = DSUtil.Format("0_{0}", _base.n_MissionIndex); - go_getbtn.SetActive(true); - } - else - { - labels[3].text = ""; - name = DSUtil.Format("1_{0}", _base.n_MissionIndex); - } + //if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount) + //{ + // name = DSUtil.Format("0_{0}", _base.n_MissionIndex); + // go_getbtn.SetActive(true); + //} + //else + //{ + // labels[3].text = ""; + // name = DSUtil.Format("1_{0}", _base.n_MissionIndex); + //} } - slider.value = (float)m_CurCount / m_MissionTableData.n_PurposeCount; + //slider.value = (float)m_CurCount / m_MissionTableData.n_PurposeCount; } public override void OnClick_RewardInfo() { - ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); + //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); } public override void OnClick_GetReward() { - if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount) - { - var sdata = ServerInfo.Ins.m_ServerData; - var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, DSUtil.Format("업적 ", m_MissionTableData.ID), eUICardType.GetItem); - sdata.Add_Item(itemdata); - S_Data[2] = 1; - S_Data[2].RandomizeCryptoKey(); - GetItemUI.Ins.Set(new List { itemdata }); - GetItemUI.Ins.Show_Items(); - //MyText.ShowToast_ItemText(itemdata); - GameUI.Ins.LobbyUI.Get_MissionUI().Set(); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); - } + //if (S_Data[2] == 0 && m_CurCount >= m_MissionTableData.n_PurposeCount) + //{ + // var sdata = ServerInfo.Ins.m_ServerData; + // var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, DSUtil.Format("업적 ", m_MissionTableData.ID), eUICardType.GetItem); + // sdata.Add_Item(itemdata); + // S_Data[2] = 1; + // S_Data[2].RandomizeCryptoKey(); + // GetItemUI.Ins.Set(new List { itemdata }); + // GetItemUI.Ins.Show_Items(); + // //MyText.ShowToast_ItemText(itemdata); + // GameUI.Ins.LobbyUI.Get_MissionUI().Set(); + // NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); + //} } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mission/MissionCard_Daily.cs b/Assets/Script/UI/Center/Mission/MissionCard_Daily.cs index fdd90e8c2..ef572682c 100644 --- a/Assets/Script/UI/Center/Mission/MissionCard_Daily.cs +++ b/Assets/Script/UI/Center/Mission/MissionCard_Daily.cs @@ -5,7 +5,7 @@ using UnityEngine; public class MissionCard_Daily : MissionCard { - MissionTableData m_MissionTableData; + MissionListTableData m_MissionTableData; List S_Data; private void Awake() @@ -17,7 +17,7 @@ public class MissionCard_Daily : MissionCard go_getbtn = mcard.go_getbtn; } - public void Set(MissionTableData _base) + public void Set(MissionListTableData _base) { //if(_base.e_Purpose == ePurpose.SowSeed || _base.e_Purpose == ePurpose.Harvest) //{ @@ -34,10 +34,10 @@ public class MissionCard_Daily : MissionCard m_MissionTableData = _base; S_Data = ServerInfo.Ins.m_ServerData.Mission[MyValue.arr_Mission[0]].Find(f => f[0] == _base.n_MissionIndex); - sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon; - labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount); - labels[1].text = m_MissionTableData.Desc; - labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount); + //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon; + //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount); + //labels[1].text = m_MissionTableData.Desc; + //labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount); go_getbtn.SetActive(false); if (S_Data[2] > 0) @@ -47,45 +47,45 @@ public class MissionCard_Daily : MissionCard } else { - if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount) - { - name = "0"; - go_getbtn.SetActive(true); - } - else - { - labels[3].text = "진행 중"; - name = "1"; - } + //if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount) + //{ + // name = "0"; + // go_getbtn.SetActive(true); + //} + //else + //{ + // labels[3].text = "진행 중"; + // name = "1"; + //} } - slider.value = (float)S_Data[1] / m_MissionTableData.n_PurposeCount; + //slider.value = (float)S_Data[1] / m_MissionTableData.n_PurposeCount; - if (m_MissionTableData.e_Purpose == ePurpose.PlayTime) - Set_Repeat_for1sec(() => - { - labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount); - }); + //if (m_MissionTableData.e_Purpose == ePurpose.PlayTime) + // Set_Repeat_for1sec(() => + // { + // labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount); + // }); } public override void OnClick_RewardInfo() { - ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); + //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); } public override void OnClick_GetReward() { - if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount) - { - var sdata = ServerInfo.Ins.m_ServerData; - var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount); - sdata.Add_Item(itemdata); - S_Data[2] = 1; - S_Data[2].RandomizeCryptoKey(); - sdata.Add_MissionCount(MyValue.arr_Mission[0], 18); - //MyText.ShowToast_ItemText(itemdata); - GameUI.Ins.LobbyUI.Get_MissionUI().Set(); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); - } + //if (S_Data[2] == 0 && S_Data[1] >= m_MissionTableData.n_PurposeCount) + //{ + // var sdata = ServerInfo.Ins.m_ServerData; + // var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount); + // sdata.Add_Item(itemdata); + // S_Data[2] = 1; + // S_Data[2].RandomizeCryptoKey(); + // sdata.Add_MissionCount(MyValue.arr_Mission[0], 18); + // //MyText.ShowToast_ItemText(itemdata); + // GameUI.Ins.LobbyUI.Get_MissionUI().Set(); + // NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); + //} } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs b/Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs index 6199be216..df7865fba 100644 --- a/Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs +++ b/Assets/Script/UI/Center/Mission/MissionCard_Repeat.cs @@ -5,7 +5,7 @@ using UnityEngine; public class MissionCard_Repeat : MissionCard { - MissionTableData m_MissionTableData; + MissionListTableData m_MissionTableData; List S_Data; private void Awake() @@ -19,63 +19,64 @@ public class MissionCard_Repeat : MissionCard labels[3].text = "진행 중"; } - public void Set(MissionTableData _base) + public void Set(MissionListTableData _base) { enabled = true; m_MissionTableData = _base; S_Data = ServerInfo.Ins.m_ServerData.Mission[MyValue.arr_Mission[1]].Find(f => f[0] == _base.n_MissionIndex); var curCount = Get_CurCount(); - sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon; - int addLv = curCount / m_MissionTableData.n_PurposeCount; - labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount * (addLv > 0 ? addLv : 1)); - labels[1].text = DSUtil.Format("{0} ({1})", m_MissionTableData.Desc, S_Data[2]); + //sprite_reward.spriteName = DSUtil.Get_ItemSpriteInfo(m_MissionTableData.e_Reward, m_MissionTableData.ID).Icon; + //int addLv = curCount / m_MissionTableData.n_PurposeCount; + //labels[0].text = DSUtil.GetThousandCommaText(m_MissionTableData.n_RewardAmount * (addLv > 0 ? addLv : 1)); + //labels[1].text = DSUtil.Format("{0} ({1})", m_MissionTableData.Desc, S_Data[2]); - labels[2].text = DSUtil.Format("{0}/{1}", curCount, m_MissionTableData.n_PurposeCount); - slider.value = (float)curCount / m_MissionTableData.n_PurposeCount; + //labels[2].text = DSUtil.Format("{0}/{1}", curCount, m_MissionTableData.n_PurposeCount); + //slider.value = (float)curCount / m_MissionTableData.n_PurposeCount; - if (slider.value >= 1f) - { - name = "0"; - go_getbtn.SetActive(true); - } - else - { - name = "1"; - go_getbtn.SetActive(false); - } + //if (slider.value >= 1f) + //{ + // name = "0"; + // go_getbtn.SetActive(true); + //} + //else + //{ + // name = "1"; + // go_getbtn.SetActive(false); + //} - if (m_MissionTableData.e_Purpose == ePurpose.PlayTime) - Set_Repeat_for1sec(() => - { - labels[2].text = DSUtil.Format("{0}/{1}", Get_CurCount(), m_MissionTableData.n_PurposeCount); - }); + //if (m_MissionTableData.e_Purpose == ePurpose.PlayTime) + // Set_Repeat_for1sec(() => + // { + // labels[2].text = DSUtil.Format("{0}/{1}", Get_CurCount(), m_MissionTableData.n_PurposeCount); + // }); } int Get_CurCount() { - return S_Data[1] - S_Data[2] * m_MissionTableData.n_PurposeCount; + return 0; + //return S_Data[1] - S_Data[2] * m_MissionTableData.n_PurposeCount; } public override void OnClick_RewardInfo() { - ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); + //ItemDescUI.Ins.Set(new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.n_RewardID, m_MissionTableData.n_RewardAmount, "", eUICardType.GetItem)); } public override void OnClick_GetReward() { - var curCount = Get_CurCount(); - if (curCount >= m_MissionTableData.n_PurposeCount) - { - var sdata = ServerInfo.Ins.m_ServerData; - var addlv = curCount / m_MissionTableData.n_PurposeCount; - var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.ID, m_MissionTableData.n_RewardAmount * addlv); - sdata.Add_Item(itemdata); - S_Data[2] += addlv; - S_Data[2].RandomizeCryptoKey(); - //MyText.ShowToast_ItemText(itemdata); - GameUI.Ins.LobbyUI.Get_MissionUI().Set(); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); - } + //var curCount = Get_CurCount(); + //if (curCount >= m_MissionTableData.n_PurposeCount) + //{ + // var sdata = ServerInfo.Ins.m_ServerData; + // var addlv = curCount / m_MissionTableData.n_PurposeCount; + // var itemdata = new ItemData(m_MissionTableData.e_Reward, m_MissionTableData.ID, m_MissionTableData.n_RewardAmount * addlv); + // sdata.Add_Item(itemdata); + // S_Data[2] += addlv; + // S_Data[2].RandomizeCryptoKey(); + // //MyText.ShowToast_ItemText(itemdata); + // GameUI.Ins.LobbyUI.Get_MissionUI().Set(); + // NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetMissionReward); + //} } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mission/Mission_Achi.cs b/Assets/Script/UI/Center/Mission/Mission_Achi.cs index 7ddd680b1..9557e8502 100644 --- a/Assets/Script/UI/Center/Mission/Mission_Achi.cs +++ b/Assets/Script/UI/Center/Mission/Mission_Achi.cs @@ -17,7 +17,7 @@ public class Mission_Achi : ScrollViewArrMgr { Chapter = _chapter; dic_cardbase[0].ForEach(f => (f as ChapterTabCard).Set_OnOff(Chapter)); - Set_ScrollView(1, table_achievementsmission.Ins.Get_DataList(Chapter), true); + Set_ScrollView(1, table_missionlist.Ins.Get_DataList(Chapter), true); Set_Coroutine(() => { Reset_Pos(1, true); }, Time.deltaTime); } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mission/Mission_Daily.cs b/Assets/Script/UI/Center/Mission/Mission_Daily.cs index de68d441e..f5e1547b4 100644 --- a/Assets/Script/UI/Center/Mission/Mission_Daily.cs +++ b/Assets/Script/UI/Center/Mission/Mission_Daily.cs @@ -6,6 +6,6 @@ public class Mission_Daily : ScrollViewMgr { private void OnEnable() { - Set_ScrollView(table_dailymission.Ins.Get_DataList(), true); + Set_ScrollView(table_missionlist.Ins.Get_DataList(), true); } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mission/Mission_Repeat.cs b/Assets/Script/UI/Center/Mission/Mission_Repeat.cs index 4e216ed75..19e41d258 100644 --- a/Assets/Script/UI/Center/Mission/Mission_Repeat.cs +++ b/Assets/Script/UI/Center/Mission/Mission_Repeat.cs @@ -6,6 +6,6 @@ public class Mission_Repeat : ScrollViewMgr { private void OnEnable() { - Set_ScrollView(table_repeatmission.Ins.Get_DataList(), true); + Set_ScrollView(table_missionlist.Ins.Get_DataList(), true); } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/NickChange.cs b/Assets/Script/UI/Center/NickChange.cs index 7d2b733ff..20bca7737 100644 --- a/Assets/Script/UI/Center/NickChange.cs +++ b/Assets/Script/UI/Center/NickChange.cs @@ -43,7 +43,7 @@ public class NickChange : BackKeyAdd ServerInfo.Ins.UpdateUserTitleDisplayName(m_Input.value, () => { - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.NickChange); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.NickChange); ServerInfo.Ins.Write(() => { text_warning.text = ""; diff --git a/Assets/Script/UI/Center/Pass/PassCard.cs b/Assets/Script/UI/Center/Pass/PassCard.cs index 8ace1bbc0..b28e1f702 100644 --- a/Assets/Script/UI/Center/Pass/PassCard.cs +++ b/Assets/Script/UI/Center/Pass/PassCard.cs @@ -59,7 +59,7 @@ public class PassCard : CardBase GetItemUI.Ins.Set(new List { idata }); GetItemUI.Ins.Show_Items(); GameUI.Ins.LobbyUI.Get_PassUI().Set(); - if (m_PassTableData.PassType == 0) NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); + //if (m_PassTableData.PassType == 0) NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); } } @@ -85,7 +85,7 @@ public class PassCard : CardBase GetItemUI.Ins.Set(new List { idata }); GetItemUI.Ins.Show_Items(); GameUI.Ins.LobbyUI.Get_PassUI().Set(); - if (m_PassTableData.PassType == 0) NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); + //if (m_PassTableData.PassType == 0) NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); } } public ItemData Get_RewardPay() diff --git a/Assets/Script/UI/Center/Pass/PassContent.cs b/Assets/Script/UI/Center/Pass/PassContent.cs index 6ed514100..ef1fd5d61 100644 --- a/Assets/Script/UI/Center/Pass/PassContent.cs +++ b/Assets/Script/UI/Center/Pass/PassContent.cs @@ -112,8 +112,7 @@ public class PassContent : ScrollViewMgr GetItemUI.Ins.Set(lst); GetItemUI.Ins.Show_Items(); Set(); - if (GameUI.Ins.LobbyUI.Get_PassUI().CurTab == 0) - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); + //if (GameUI.Ins.LobbyUI.Get_PassUI().CurTab == 0) NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.GetPass); } } diff --git a/Assets/Script/UI/Center/Title/TitleCard.cs b/Assets/Script/UI/Center/Title/TitleCard.cs index 64a416c44..27d937cbe 100644 --- a/Assets/Script/UI/Center/Title/TitleCard.cs +++ b/Assets/Script/UI/Center/Title/TitleCard.cs @@ -22,7 +22,7 @@ public class TitleCard : CardBase go_bg.SetActive(m_TitleTableData.ID % 2 == 0); UnSelect(); - go_guidearrow.SetActive(m_TitleTableData.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); + //go_guidearrow.SetActive(m_TitleTableData.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); } public TitleTableData Get_Data() { return m_TitleTableData; } @@ -30,7 +30,7 @@ public class TitleCard : CardBase public void UnSelect() { go_select.SetActive(false); - go_guidearrow.SetActive(m_TitleTableData.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); + //go_guidearrow.SetActive(m_TitleTableData.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); } public void OnClick_Select() diff --git a/Assets/Script/UI/Center/Title/TitleUI.cs b/Assets/Script/UI/Center/Title/TitleUI.cs index c60d9b1c3..4a4e0241a 100644 --- a/Assets/Script/UI/Center/Title/TitleUI.cs +++ b/Assets/Script/UI/Center/Title/TitleUI.cs @@ -61,7 +61,7 @@ public class TitleUI : LobbyNonMenuBase slider_proc.value = a / b; } - gos[1].SetActive(data.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); + //gos[1].SetActive(data.ID == 94 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); Cal_Gem(); } @@ -103,7 +103,7 @@ public class TitleUI : LobbyNonMenuBase Set(); if (m_SelectTitle.Get_Data().ID == 94) { - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ChangeTitle); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ChangeTitle); gos[1].SetActive(false); } } @@ -129,6 +129,6 @@ public class TitleUI : LobbyNonMenuBase base.OnClick_Back(); TitleGetUI.list_gettitle.Clear(); GameUI.Ins.LobbyUI.Set_Noti(); - GuideQuestArrow.Ins.gos_arrow[31].gos[0].SetActive(NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); + //GuideQuestArrow.Ins.gos_arrow[31].gos[0].SetActive(NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.ChangeTitle && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); } } \ No newline at end of file diff --git a/Assets/Script/UI/Common/GuideQuestUI.cs b/Assets/Script/UI/Common/GuideQuestUI.cs index e8cf6883f..b86b186b8 100644 --- a/Assets/Script/UI/Common/GuideQuestUI.cs +++ b/Assets/Script/UI/Common/GuideQuestUI.cs @@ -12,7 +12,7 @@ public class GuideQuestUI : MonoBehaviour public GuideQuestComplete m_GuideQuestComplete; public Animation m_Anim; // GuideQuestLeft GuideQuestRight - GuideQuestTableData Tdata; + MissionListTableData Tdata; List List_CurArrow = new List(); bool bOn = true; @@ -21,7 +21,7 @@ public class GuideQuestUI : MonoBehaviour m_Anim.Play("GuideQuestRight"); } - public ePurpose Get_Purpose() { return Tdata != null ? Tdata.e_Purpose : ePurpose.Complete; } + public ePurpose Get_Purpose() { return Tdata != null ? Tdata.e_MissionConditionType : ePurpose.None; } public void Add_Arrow(GameObject _arrow) { List_CurArrow.Add(_arrow); } public void Set() { @@ -37,78 +37,78 @@ public class GuideQuestUI : MonoBehaviour #endif else { - Tdata = table_guidequest.Ins.Get_Data(step); - if (Tdata.e_Purpose == ePurpose.Complete) - gameObject.SetActive(false); - else - { - //GuideQuestArrow.Ins.Set(Tdata.ID, sdata.Get_Common(eCommon.GuideClear) == 0); - sprite[0].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.Target); - sprite[1].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.TargetSub); - sprite[2].sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Get_ItemSpriteInfo(Tdata.e_Reward, Tdata.n_RewardID).Icon); - labels[0].text = DSUtil.GetThousandCommaText(Tdata.n_RewardAmount); - labels[1].text = Tdata.Desc; - labels[3].text = (Tdata.ID + 1).ToString(); + //Tdata = table_guidequest.Ins.Get_Data(step); + //if (Tdata.e_Purpose == ePurpose.Complete) + // gameObject.SetActive(false); + //else + //{ + // //GuideQuestArrow.Ins.Set(Tdata.ID, sdata.Get_Common(eCommon.GuideClear) == 0); + // sprite[0].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.Target); + // sprite[1].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.TargetSub); + // sprite[2].sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Get_ItemSpriteInfo(Tdata.e_Reward, Tdata.n_RewardID).Icon); + // labels[0].text = DSUtil.GetThousandCommaText(Tdata.n_RewardAmount); + // labels[1].text = Tdata.Desc; + // labels[3].text = (Tdata.ID + 1).ToString(); - gos[0].SetActive(sdata.Get_Common(eCommon.GuideClear) > 0); - gos[1].SetActive(Tdata.ID == 3); + // gos[0].SetActive(sdata.Get_Common(eCommon.GuideClear) > 0); + // gos[1].SetActive(Tdata.ID == 3); - // 선행됐는 지 체크 - switch (Tdata.e_Purpose) - { - case ePurpose.JoystickChest: - break; - case ePurpose.AutoTarget: - case ePurpose.AutoMagic: - if (sdata.Get_Common(eCommon.Auto) == 1) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.Clear1_2: - //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 2 || MobInfo.Ins.Get_CurStage() > 2) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.Clear1_5: - //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 5 || MobInfo.Ins.Get_CurStage() > 5) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.Clear1_10: - //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 10 || MobInfo.Ins.Get_CurStage() > 10) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.EqiupWeapon: - if (sdata.Get_EqiupmentEquip(eItem.Weapon) != 1) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.EqiupFairy: - if (sdata.Get_EqiupmentEquip(eItem.Fairy) > 0) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.EquipPet: - break; - case ePurpose.EquipMagic: - for (int i = 1; i < 6; i++) - { - if (sdata.Get_EquipSkillID(i) > 0) - { - Add_GuideQuest(Tdata.e_Purpose); - break; - } - } - break; - case ePurpose.UsePotion: - if (sdata.Is_UsePotion()) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.NickChange: - if (sdata.Get_Common(eCommon.NickChange) > 0) - Add_GuideQuest(Tdata.e_Purpose); - break; - case ePurpose.ChapterChange: - //if (sdata.Get_Common(eCommon.Chapter) > 1) - Add_GuideQuest(Tdata.e_Purpose); - break; - } - } + // // 선행됐는 지 체크 + // switch (Tdata.e_Purpose) + // { + // case ePurpose.JoystickChest: + // break; + // case ePurpose.AutoTarget: + // case ePurpose.AutoMagic: + // if (sdata.Get_Common(eCommon.Auto) == 1) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.Clear1_2: + // //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 2 || MobInfo.Ins.Get_CurStage() > 2) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.Clear1_5: + // //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 5 || MobInfo.Ins.Get_CurStage() > 5) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.Clear1_10: + // //if (sdata.Get_Common(eCommon.MaxMapID) > 1 || sdata.Get_Common(eCommon.MaxStage) > 10 || MobInfo.Ins.Get_CurStage() > 10) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.EqiupWeapon: + // if (sdata.Get_EqiupmentEquip(eItem.Weapon) != 1) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.EqiupFairy: + // if (sdata.Get_EqiupmentEquip(eItem.Fairy) > 0) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.EquipPet: + // break; + // case ePurpose.EquipMagic: + // for (int i = 1; i < 6; i++) + // { + // if (sdata.Get_EquipSkillID(i) > 0) + // { + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // } + // } + // break; + // case ePurpose.UsePotion: + // if (sdata.Is_UsePotion()) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.NickChange: + // if (sdata.Get_Common(eCommon.NickChange) > 0) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // case ePurpose.ChapterChange: + // //if (sdata.Get_Common(eCommon.Chapter) > 1) + // Add_GuideQuest(Tdata.e_Purpose); + // break; + // } + //} } } void Set_Complete() @@ -128,7 +128,7 @@ public class GuideQuestUI : MonoBehaviour public void Add_GuideQuest(ePurpose _purpose) { - if (Tdata != null && Tdata.e_Purpose == _purpose) + if (Tdata != null && Tdata.e_MissionConditionType == _purpose) { ServerInfo.Ins.m_ServerData.Add_Common(eCommon.GuideClear); gos[0].SetActive(true); @@ -136,8 +136,6 @@ public class GuideQuestUI : MonoBehaviour List_CurArrow.ForEach(f => f.SetActive(false)); List_CurArrow.Clear(); GuideQuestArrow.Ins.AllArrowOff(); - if (_purpose == ePurpose.FreePackage) - ShopEventCheck.Ins.gameObject.SetActive(true); } } @@ -153,7 +151,7 @@ public class GuideQuestUI : MonoBehaviour { sdata.Set_Common(eCommon.GuideClear, 0); sdata.Add_Common(eCommon.GuideStep); - GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(Tdata.e_Reward, Tdata.n_RewardID, Tdata.n_RewardAmount, DSUtil.Format("guide {0}", Tdata.ID), eUICardType.GetItem))); + //GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(Tdata.e_Reward, Tdata.n_RewardID, Tdata.n_RewardAmount, DSUtil.Format("guide {0}", Tdata.ID), eUICardType.GetItem))); GetItemUI.Ins.Show_Items(); Set(); } diff --git a/Assets/Script/UI/Common/MixPopup.cs b/Assets/Script/UI/Common/MixPopup.cs index 4e2c885fe..cbc77c753 100644 --- a/Assets/Script/UI/Common/MixPopup.cs +++ b/Assets/Script/UI/Common/MixPopup.cs @@ -72,10 +72,10 @@ public class MixPopup : MenuBase } } - switch (m_ItemData.ItemType) - { - case eItem.Ring: NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.MixRing); break; - } + //switch (m_ItemData.ItemType) + //{ + // case eItem.Ring: NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.MixRing); break; + //} GetItemUI.Ins.Set(itemlst); ServerInfo.Ins.Write(() => @@ -85,8 +85,6 @@ public class MixPopup : MenuBase } else { - Content_Equipment.Ins.Refresh_RightCards(); - Content_Equipment.Ins.m_EquipmentInfoPopup.Set_UI(); } GetItemUI.Ins.Show_Items(); Refresh_UI(); @@ -107,28 +105,4 @@ public class MixPopup : MenuBase else if (m_ItemData.ItemType == eItem.Skill) return 22; return m_ItemData.ItemType - eItem.Weapon + 16; } - - public void OnClick_Select_Previous() - { - if (m_ItemData.ItemType == eItem.Pet) - { } - else - ArrowSet(Content_Equipment.Ins.m_Equipment_Right.Get_PreNextCard_orNull(true, true, m_ItemData.Get_ID())); - } - public void OnClick_Select_Next() - { - if (m_ItemData.ItemType == eItem.Pet) - { } - else - ArrowSet(Content_Equipment.Ins.m_Equipment_Right.Get_PreNextCard_orNull(true, false, m_ItemData.Get_ID())); - } - void ArrowSet(UIItemCard _card) - { - if (_card != null) - { - if (m_ItemData.ItemType != eItem.Pet) - Content_Equipment.Ins.m_EquipmentInfoPopup.Set(_card); - Set(_card); - } - } } \ No newline at end of file diff --git a/Assets/Script/UI/Common/UIItemCard.cs b/Assets/Script/UI/Common/UIItemCard.cs index 2653cf682..fd9bd2a5d 100644 --- a/Assets/Script/UI/Common/UIItemCard.cs +++ b/Assets/Script/UI/Common/UIItemCard.cs @@ -377,7 +377,6 @@ public class UIItemCard : CardCoolTimeBase switch (CardType) { case eUICardType.UI: - Content_Equipment.Ins.Select_ItemData(this); break; case eUICardType.Use: if (m_CoolTime <= 0f) @@ -422,7 +421,6 @@ public class UIItemCard : CardCoolTimeBase { case eUICardType.UI: case eUICardType.Use: - Content_Equipment.Ins.Select_ItemData(this); break; case eUICardType.Inven: // InvenCard 만들어서 그쪽에서 처리 @@ -446,7 +444,6 @@ public class UIItemCard : CardCoolTimeBase } else if (m_ItemData.Lv > 0) { - Content_Equipment.Ins.Refresh_RightCards(); //if (gos[7].activeInHierarchy) // Set_GuideArrow(false); diff --git a/Assets/Script/UI/ETC/GuideQuestArrow.cs b/Assets/Script/UI/ETC/GuideQuestArrow.cs index c86f26e76..0f22eadba 100644 --- a/Assets/Script/UI/ETC/GuideQuestArrow.cs +++ b/Assets/Script/UI/ETC/GuideQuestArrow.cs @@ -13,8 +13,8 @@ public class GuideQuestArrow : MonoBehaviourSingletonTemplate private void Start() { AllArrowOff(); - if (NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.Complete) - enabled = false; + //if (NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.Complete) + // enabled = false; } public void AllArrowOff() diff --git a/Assets/Script/UI/GameUI.cs b/Assets/Script/UI/GameUI.cs index 521992d70..c9de68446 100644 --- a/Assets/Script/UI/GameUI.cs +++ b/Assets/Script/UI/GameUI.cs @@ -16,7 +16,6 @@ public class Lobby_Bundle #region 사용 클래스 모음 public Menu_Chapter Get_MenuChapter() { return arr_Menu[0] as Menu_Chapter; } - public Menu_Equipment Get_MenuEquipment() { return arr_Menu[2] as Menu_Equipment; } public Menu_Pet Get_MenuPet() { return arr_Menu[3] as Menu_Pet; } public Menu_Book Get_MenuBook() { return arr_Menu[5] as Menu_Book; } public Menu_Shop Get_MenuShop() { return arr_Menu[6] as Menu_Shop; } @@ -104,8 +103,6 @@ public class Lobby_Bundle case "Witch": break; case "Equipment": - if (MyValue.CanEnter_Content(eContentOpen.Equipment)) - Get_MenuEquipment().Set(); break; case "Pet": if (MyValue.CanEnter_Content(eContentOpen.Pet)) diff --git a/Assets/Script/UI/Kettle/CardInKettlePotion.cs b/Assets/Script/UI/Kettle/CardInKettlePotion.cs index 66d26a224..bc1621a89 100644 --- a/Assets/Script/UI/Kettle/CardInKettlePotion.cs +++ b/Assets/Script/UI/Kettle/CardInKettlePotion.cs @@ -61,7 +61,7 @@ public class CardInKettlePotion : CardBase { sdata.Add_PotionTime(m_Tdata.ID); Content_Potion.Ins.Set_UI(); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.UsePotion); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.UsePotion); } } } \ No newline at end of file diff --git a/Assets/Script/UI/Menu/Menu_Book.cs b/Assets/Script/UI/Menu/Menu_Book.cs index e9bdf0717..803e401eb 100644 --- a/Assets/Script/UI/Menu/Menu_Book.cs +++ b/Assets/Script/UI/Menu/Menu_Book.cs @@ -30,7 +30,7 @@ public class Menu_Book : MenuBase m_Content_Book.Set(CurTab + 1); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.LookBook); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.LookBook); } protected override void Set_Tab() diff --git a/Assets/Script/UI/Menu/Menu_Equipment.cs b/Assets/Script/UI/Menu/Menu_Equipment.cs deleted file mode 100644 index cfa002fe0..000000000 --- a/Assets/Script/UI/Menu/Menu_Equipment.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Menu_Equipment : MenuBase -{ - public Content_Equipment m_Content_Equipment; - public WitchMiniInfo m_WitchMiniInfo; - public GameObject[] gos_guidearrow; // 0 지팡이, 1 반지, 2 요정, 3 합성, 4 마법 - - public override void Set() - { - base.Set(); - Set_UI(); - m_Content_Equipment.Set(eItem.Weapon + CurTab, true, Set_Tab); - } - - public override void Set_Noti() - { - for (int i = 0; i < gos_noti.Length; i++) - gos_noti[i].SetActive(GameUI.Ins.ExistNewItem(eItem.Weapon + i)); - } - - void Set_Tab(int _tab) - { - CurTab = _tab; - Set_Tab(); - m_Content_Equipment.Set(eItem.Weapon + CurTab, false, Set_Tab); - } - protected override void Set_Tab() - { - base.Set_Tab(); - - DSUtil.InActivateGameObjects(gos_guidearrow); - switch (NewGameUI.Ins.m_GuideQuestUI.Get_Purpose()) - { - case ePurpose.EqiupWeapon: - gos_guidearrow[0].SetActive(CurTab != 0 && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); - break; - case ePurpose.MixRing: - gos_guidearrow[1].SetActive(CurTab != 1 && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); - gos_guidearrow[3].SetActive(CurTab == 1 && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); - NewGameUI.Ins.m_GuideQuestUI.Add_Arrow(gos_guidearrow[3]); - break; - case ePurpose.EqiupFairy: - gos_guidearrow[2].SetActive(CurTab != 4 && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); - break; - case ePurpose.EquipMagic: - case ePurpose.EnchantMagic: - gos_guidearrow[4].SetActive(CurTab != 6 && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0); - break; - } - } - - public void Set_UI() - { - m_WitchMiniInfo.Set(ServerInfo.Ins.UserName, ServerInfo.Ins.m_ServerData); - //m_StatUI.Set(ServerInfo.Ins.m_ServerData); - } - - public override void OnClick_Tab(GameObject _go) - { - CurTab = int.Parse(_go.name); - Set_Tab(); - m_Content_Equipment.Set(eItem.Weapon + CurTab, false, Set_Tab); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Menu/Menu_Equipment.cs.meta b/Assets/Script/UI/Menu/Menu_Equipment.cs.meta deleted file mode 100644 index c2684476a..000000000 --- a/Assets/Script/UI/Menu/Menu_Equipment.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d9b9d38bbd5619f4db32c743dc17c0cc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment.meta b/Assets/Script/UI/MenuEquipment.meta deleted file mode 100644 index bc38b228f..000000000 --- a/Assets/Script/UI/MenuEquipment.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6f355bcee02565f48b211f441522c23f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/Content_Equipment.cs b/Assets/Script/UI/MenuEquipment/Content_Equipment.cs deleted file mode 100644 index e4f56bac2..000000000 --- a/Assets/Script/UI/MenuEquipment/Content_Equipment.cs +++ /dev/null @@ -1,178 +0,0 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Content_Equipment : MonoBehaviourSingletonTemplate -{ - public Equipment_Left m_Equipment_Left; - public Equipment_Right m_Equipment_Right; - public EquipmentInfoPopup m_EquipmentInfoPopup; - public EquipmentReinforceInitPopup m_EquipmentReinforceInitPopup; - public UILabel[] labels; // 0 일괄합성 - - eItem m_type; - Action act_setTab; - - protected override void Awake() - { - base.Awake(); - m_EquipmentInfoPopup.Check(); - m_EquipmentReinforceInitPopup.Check(); - } - - public void Set(eItem _type, bool _init, Action _settab) - { - gameObject.SetActive(true); - m_type = _type; - act_setTab = _settab; - m_Equipment_Left.Set(_init); - Refresh_RightCards(); - //labels[0].text = MyText.Get_ItemName(_type); - GameUI.Ins.Clear_newItem(_type); - } - public void Refresh_RightCards() { m_Equipment_Right.Set(m_type); } - public void Select_Card(ItemData _id) - { - if (m_type != _id.ItemType) - { - m_type = _id.ItemType; - act_setTab(m_type - eItem.Weapon); - Refresh_RightCards(); - } - var card = m_Equipment_Right.Get_Card_orNull(_id); - if (card != null) Select_ItemData(card); - } - public void Select_ItemData(UIItemCard _card) - { - _card.Get_ItemData().Deck = m_Equipment_Left.m_DeckTabUI.Get_Tab(); - m_EquipmentInfoPopup.Set(_card); - } - - void FindSelectCard(bool reselect) - { - //if (reselect || SelectCard == null) - //{ - // var sdata = ServerInfo.Ins.m_ServerData; - // if (m_type == eItem.Magic) - // { - // // 스킬 선택 - // switch (GameUI.Ins.CommonUI.m_GuideQuestUI.Get_Purpose()) - // { - // case eGuideQuestPurpose.EquipMagic: - // if (sdata.Get_Common(eCommon.GuideClear) == 0) - // for (int ii = 0; ii < list_CardBase.Count; ii++) - // { - // var data = list_CardBase[ii] as UIItemCard; - // if (data.Get_SkillTableData().ID != 1 && data.Get_ItemData().Lv > 0) - // { - // SelectCard = data; - // SelectCard.Set_GuideArrow(true); - // break; - // } - // } - // break; - // case eGuideQuestPurpose.EnchantMagic: - // SelectCard = list_CardBase[0] as UIItemCard; - // break; - // default: - // if (SelectCard == null) SelectCard = list_CardBase[0] as UIItemCard; - // break; - // } - // } - // else - // { - // SelectCard = list_CardBase[0] as UIItemCard; - // //int id = sdata.Equip.Get_Preset_byPrest(m_DeckTabUI.Get_Tab()).EquipMentEquip[m_type - eItem.PC]; - // //if (id > 0) SelectCard = list_CardBase.Find(f => (f as UIItemCard).IsID(id)) as UIItemCard; - // } - //} - } - - public void OnClick_AllMix() - { - //Popup.Ins.Set(ePopupType.Two, "일괄합성을 하시겠습니까?", () => - Popup.Ins.Set(ePopupType.Two, 0, () => - { - var sdata = ServerInfo.Ins.m_ServerData; - if (m_type == eItem.Skill) - { - List datas = new List(); - // ID, 갯수, 레벨, 특성1, 특성2 - for (int i = 0; i < sdata.Skill.Count; i++) - { - //var tdata = table_skilllist.Ins.Get_Data(sdata.Skill[i][0], sdata); - //if (tdata.e_Grade < eItemGrade.Myth && sdata.Skill[i][1] >= MyValue.arr_NeedMixCount[(int)tdata.e_Grade]) - //{ - // int mixcount = sdata.Skill[i][1] / MyValue.arr_NeedMixCount[(int)tdata.e_Grade]; - // sdata.Use_Item(eItem.Magic, MyValue.arr_NeedMixCount[(int)tdata.e_Grade] * mixcount, tdata.ID, "mix"); - // for (int j = 0; j < mixcount; j++) - // { - // int id = MyValue.Get_NextGradeID(tdata.e_Grade); - // if (id > 0) - // datas.AddRange(sdata.Add_Item(new ItemData(eItem.Magic, id, 1, "", eUICardType.GetItem))); - // } - //} - } - if (datas.Count > 0) - { - GetItemUI.Ins.Set(datas); - ServerInfo.Ins.Write(() => - { - GetItemUI.Ins.Show_Items(); - Refresh_RightCards(); - }); - } - //else - // ToastUI.Ins.Set("합성할 수 있는 마법이 없습니다."); - } - else - { - List> list = null; - table_itemdatabase itemtable = null; - switch (m_type) - { - //case eItem.Weapon: list = sdata.Equipment[MyValue.str_EquipMent[0]]; itemtable = table_weapon.Ins; break; - //case eItem.Ring: list = sdata.Equipment[MyValue.str_EquipMent[2]]; itemtable = table_ring.Ins; NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.MixRing); break; - //case eItem.Neck: list = sdata.Equipment[MyValue.str_EquipMent[3]]; itemtable = table_neck.Ins; break; - //case eItem.Boots: list = sdata.Equipment[MyValue.str_EquipMent[4]]; itemtable = table_boots.Ins; break; - //case eItem.Fairy: list = sdata.Equipment[MyValue.str_EquipMent[5]]; itemtable = table_fairy.Ins; break; - } - if (list != null && itemtable != null) - { - List datas = new List(); - for (int i = 0; i < list.Count; i++) - { - if (list[i][1] > 0) - { - var tabledata = itemtable.Get_Data(list[i][0]); - if (tabledata.Grade < eItemGrade.Myth) - { - int mixcount = list[i][3] / MyValue.arr_NeedMixCount[(int)tabledata.Grade]; - sdata.Use_Item(m_type, mixcount * MyValue.arr_NeedMixCount[(int)tabledata.Grade], tabledata.ID, "mix"); - for (int j = 0; j < mixcount; j++) - { - int id = MyValue.Get_NextGradeID(tabledata.Grade); - if (id > 0) - datas.AddRange(sdata.Add_Item(new ItemData(m_type, id, 1, "", eUICardType.GetItem))); - } - } - } - } - if (datas.Count > 0) - { - GetItemUI.Ins.Set(datas); - ServerInfo.Ins.Write(() => - { - GetItemUI.Ins.Show_Items(); - Refresh_RightCards(); - }); - } - //else - // ToastUI.Ins.Set("합성할 수 있는 아이템이 없습니다."); - } - } - }); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/Content_Equipment.cs.meta b/Assets/Script/UI/MenuEquipment/Content_Equipment.cs.meta deleted file mode 100644 index abf7bc69b..000000000 --- a/Assets/Script/UI/MenuEquipment/Content_Equipment.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a3d7a09a2bd4d1c4eaddadf8fc06c537 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs b/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs deleted file mode 100644 index 4c41d2a1b..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EquipmentInfoPopup : BackKeyAdd -{ - public EquipmentInfoUI m_EquipmentInfoUI; - public CountChoiceUI m_CountChoiceUI; - public GameObject[] gos; // 0 장비 초월, 1 마법 개화 - - UIItemCard m_ItemCard; - - protected override void Awake() - { - base.Awake(); - m_CountChoiceUI.Set(Set_UI); - } - - public void Set(UIItemCard _card) - { - base.Set(); - m_ItemCard = _card; - Set_UI(); - DSUtil.InActivateGameObjects(gos, m_ItemCard.Get_ItemData().ItemType == eItem.Skill ? 1 : 0); - } - - public void Set_UI() - { - m_EquipmentInfoUI.Set(m_ItemCard, m_CountChoiceUI.Get_Count()); - } - - public void OnClick_Select_Previous() - { - Set(Content_Equipment.Ins.m_Equipment_Right.Get_PreNextCard_orNull(false, true, m_ItemCard.Get_ItemData().Get_ID())); - } - public void OnClick_Select_Next() - { - Set(Content_Equipment.Ins.m_Equipment_Right.Get_PreNextCard_orNull(false, false, m_ItemCard.Get_ItemData().Get_ID())); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs.meta b/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs.meta deleted file mode 100644 index 0084bb79b..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentInfoPopup.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6e689bd357bfbcb4995276977fdf028e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs b/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs deleted file mode 100644 index ff321e0c1..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EquipmentLeftCard : CardBase -{ - List sprites = new List(); // 0 등급, 1 아이콘 - - ItemData m_ItemData; - - private void Awake() - { - sprites.Add(transform.GetChild(0).GetComponent()); - sprites.Add(transform.GetChild(1).GetComponent()); - } - - public override void Set(T _base) - { - base.Set(_base); - m_ItemData = _base as ItemData; - - if (m_ItemData.Get_ID() > 0) - { - sprites[0].spriteName = DSUtil.Get_GradeSpriteName(m_ItemData.Grade); - sprites[1].spriteName = m_ItemData.IconInfo.Icon; - } - else - { - sprites[1].spriteName = "empty"; - switch (m_ItemData.ItemType) - { - case eItem.Weapon: - case eItem.Ring: - case eItem.Necklace: - case eItem.Extra: - case eItem.Fairy: - case eItem.WeaponCostume: - sprites[0].spriteName = "empty_slot_equipment"; - break; - case eItem.Skill: - sprites[0].spriteName = "empty_slot_magic"; - break; - } - } - } - - public void OnClick_EquipItem() - { - if (m_ItemData != null && m_ItemData.Get_ID() > 0) - Content_Equipment.Ins.Select_Card(m_ItemData); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs.meta b/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs.meta deleted file mode 100644 index adacbbff1..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentLeftCard.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2081f9c9e6b163d4b92843f6a6ad6668 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs b/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs deleted file mode 100644 index f6424ed59..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs +++ /dev/null @@ -1,41 +0,0 @@ -using CodeStage.AntiCheat.ObscuredTypes; -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EquipmentReinforceInitPopup : BackKeyAdd -{ - public UILabel label_price; - - ItemData m_ItemData; - int[] arr_resetPrice = new int[] { 0, 50, 60, 70, 80, 90, 100, 200 }; - Action act_refresh; - - public void Set(ItemData _id, Action _refresh) - { - base.Set(); - m_ItemData = _id; - act_refresh = _refresh; - label_price.text = DSUtil.GetThousandCommaText(arr_resetPrice[(int)m_ItemData.Grade]); - } - - public void OnClick_ResetReinforce() - { - var sdata = ServerInfo.Ins.m_ServerData; - if (m_ItemData.Lv > 1 && sdata.Check_ItemAmount(eItem.Gem, arr_resetPrice[(int)m_ItemData.Grade])) - { - sdata.Use_Item(eItem.Gem, arr_resetPrice[(int)m_ItemData.Grade], 0, "장비 강초"); - ObscuredDouble UsedAllStone = m_ItemData.Get_UsedAllStone(); - var stonetype = DSUtil.Get_StoneType(m_ItemData.ItemType); - var item = sdata.Add_Item(new ItemData(stonetype, 0, UsedAllStone, "", eUICardType.GetItem)); - GetItemUI.Ins.Set(item); - - //sdata.Add_SmeltingLv(m_ItemData.ItemType, m_ItemData.Get_ID(), -(m_ItemData.Lv - 1)); - m_ItemData.Lv = 1; - m_ItemData.Lv.RandomizeCryptoKey(); - - ServerInfo.Ins.Write(() => { OnClick_Back(); GetItemUI.Ins.Show_Items(); act_refresh(); }); - } - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs.meta b/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs.meta deleted file mode 100644 index 512fe6590..000000000 --- a/Assets/Script/UI/MenuEquipment/EquipmentReinforceInitPopup.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 67c78b6f8ff82574aac0a893cdedd78f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/Equipment_Left.cs b/Assets/Script/UI/MenuEquipment/Equipment_Left.cs deleted file mode 100644 index 0306a1270..000000000 --- a/Assets/Script/UI/MenuEquipment/Equipment_Left.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Equipment_Left : MonoBehaviour -{ - public UILabel[] labels; // 0 레벨, 1 이름 - public DeckTabUI m_DeckTabUI; - public UISprite sprite_pc; - public EquipmentLeftCard[] arr_EquipmentLeftCard; // 0 지팡이, 1 반지, 2 목걸이, 3 반지, 4 신발, 5 요정, 6 7 8 9 10 11 마법 - public UILabel[] labels_stat, labels_statvalue; // 공격력 ~ 골드 획득량 - public UISprite[] sprites_stat; // 0 배경, 1 세모 - public GameObject[] gos_stat; // 0 세모 배경, 1 2 스탯 부모 - - bool FullInfo = false; - - public void Set(bool _init) - { - FullInfo = false; - var sdata = ServerInfo.Ins.m_ServerData; - labels[0].text = DSUtil.Format("Lv.{0}", sdata.PC.Lv); - labels[1].text = ServerInfo.Ins.UserName; - - if (_init) - m_DeckTabUI.Set(1, () => { Set_UI(true, true); }, false); - else - Set_UI(false, false); - } - - public void Set_UI(bool _deckchange, bool _rightmovescroll) - { - var sdata = ServerInfo.Ins.m_ServerData; - - //var equips = sdata.Equip.Get_Preset_byPrest(m_DeckTabUI.Get_Tab()); - //sprite_pc.spriteName = DSUtil.Get_ItemSpriteInfo(eItem.PC, equips.EquipMentEquip[0]).SubIcon; - - //arr_EquipmentLeftCard[0].Set(new ItemData(eItem.Weapon, equips.EquipMentEquip[1], 0)); - //arr_EquipmentLeftCard[1].Set(new ItemData(eItem.Ring, equips.EquipMentEquip[2], 0)); - //arr_EquipmentLeftCard[2].Set(new ItemData(eItem.Neck, equips.EquipMentEquip[3], 0)); - //arr_EquipmentLeftCard[3].Set(new ItemData(eItem.Boots, equips.EquipMentEquip[4], 0)); - //arr_EquipmentLeftCard[4].Set(new ItemData(eItem.Fairy, equips.EquipMentEquip[5], 0)); - - //for (int i = 5; i < arr_EquipmentLeftCard.Length; i++) - // arr_EquipmentLeftCard[i].Set(new ItemData(eItem.Magic, equips.MagicEquip[i - 5], 0)); - - Set_Info(); - if (_deckchange && Content_Equipment.Ins.m_Equipment_Right.IsInit) Content_Equipment.Ins.m_Equipment_Right.Set_UI(_rightmovescroll); - } - - void Set_Info() - { - var sdata = ServerInfo.Ins.m_ServerData; - int ii = 0; - var statinfo = MyValue.Get_ActorStatInfoorNull(eRole.PC, true, m_DeckTabUI.Get_Tab()); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.ATK, statinfo.Get_Stat(eStat.ATK)); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.HP, statinfo.Get_Stat(eStat.HP)); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.MP, statinfo.Get_Stat(eStat.MP)); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.MP_REGEN, statinfo.Get_Stat(eStat.MP_REGEN)); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.CRI, statinfo.Get_Stat(eStat.CRI)); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.CRI_DMG_Multiplier, statinfo.Get_Stat(eStat.CRI_DMG_Multiplier)); - - if (FullInfo) - { - labels_stat[ii].text = MyText.Get_StatName(eStat.DEF); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.DEF, statinfo.Get_Stat(eStat.DEF)); - labels_stat[ii].text = MyText.Get_StatName(eStat.M_DEF); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.M_DEF, statinfo.Get_Stat(eStat.M_DEF)); - labels_stat[ii].text = MyText.Get_StatName(eStat.HERO_ATK_SPD); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.HERO_ATK_SPD, statinfo.Get_Stat(eStat.HERO_ATK_SPD)); - labels_stat[ii].text = MyText.Get_StatName(eStat.AttackCoolTime); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.AttackCoolTime, statinfo.Get_Stat(eStat.AttackCoolTime)); - labels_stat[ii].text = MyText.Get_StatName(eStat.EXP_Multiplier); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.EXP_Multiplier, statinfo.Get_Stat(eStat.EXP_Multiplier)); - labels_stat[ii].text = MyText.Get_StatName(eStat.GOLD_Multiplier); - labels_statvalue[ii++].text = MyText.Get_StatValueText(eStat.GOLD_Multiplier, statinfo.Get_Stat(eStat.GOLD_Multiplier)); - - sprites_stat[0].SetDimensions(356, 320); - sprites_stat[1].transform.localEulerAngles = Vector3.forward * 180f; - gos_stat[0].transform.localPosition = new Vector3(0f, 216f); - gos_stat[1].transform.localPosition = new Vector3(-164.3f, 178f); - gos_stat[2].transform.localPosition = new Vector3(167f, 178f); - } - else - { - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - labels_stat[ii].text = labels_statvalue[ii++].text = ""; - - sprites_stat[0].SetDimensions(356, 200); - sprites_stat[1].transform.localEulerAngles = Vector3.zero; - gos_stat[0].transform.localPosition = new Vector3(0f, 82f); - gos_stat[1].transform.localPosition = new Vector3(-164.3f, 43f); - gos_stat[2].transform.localPosition = new Vector3(167f, 43f); - } - } - - public void OnClick_FullInfo() - { - FullInfo = !FullInfo; - Set_Info(); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/Equipment_Left.cs.meta b/Assets/Script/UI/MenuEquipment/Equipment_Left.cs.meta deleted file mode 100644 index edf0f3bb2..000000000 --- a/Assets/Script/UI/MenuEquipment/Equipment_Left.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 60dc0a17b69533041a1d78efb14b7846 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/MenuEquipment/Equipment_Right.cs b/Assets/Script/UI/MenuEquipment/Equipment_Right.cs deleted file mode 100644 index e15459bd6..000000000 --- a/Assets/Script/UI/MenuEquipment/Equipment_Right.cs +++ /dev/null @@ -1,177 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Equipment_Right : ScrollViewMgr -{ - eItem m_type; - public bool IsInit { get; private set; } - - public void Set(eItem _type) - { - m_type = _type; - Set_UI(true); - Check_GuideQuest(); - IsInit = true; - } - public void Set_UI(bool _movescroll) - { - var sdata = ServerInfo.Ins.m_ServerData; - - var curPreset = Content_Equipment.Ins.m_Equipment_Left.m_DeckTabUI.Get_Tab(); - List list = null; - switch (m_type) - { - //case eItem.Weapon: list = table_weapon.Ins.Get_ItemDatas(curPreset, eUICardType.UI); break; - case eItem.Fairy: list = table_fairy.Ins.Get_ItemDatas(curPreset, eUICardType.UI); break; - //case eItem.Skill: list = table_skilllist.Ins.Get_ItemDatas(curPreset, eUICardType.UI); break; - } - //if (_movescroll) - //{ - // if (m_type == eItem.Magic) - // { - // int magicequipid = sdata.Equip.Get_Preset_byPrest(curPreset).MagicEquip.Find(f => f > 0); - // MoveScroll(magicequipid); - // } - // else - // MoveScroll(sdata.Equip.Get_Preset_byPrest(curPreset).EquipMentEquip[m_type - eItem.PC]); - //} - Set_ScrollView(list); - } - - void Check_GuideQuest() - { - switch (NewGameUI.Ins.m_GuideQuestUI.Get_Purpose()) - { - // 제일 앞 카드 - case ePurpose.MixRing: - if (m_type == eItem.Ring && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0) - (list_CardBase[0] as UIItemCard).Set_GuideArrow(true); - break; - case ePurpose.EnchantMagic: - if (m_type == eItem.Skill && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0) - (list_CardBase[0] as UIItemCard).Set_GuideArrow(true); - break; - - // 제일 좋은 카드 - case ePurpose.EqiupWeapon: - Check_GuideItem(eItem.Weapon, true); - break; - case ePurpose.EqiupFairy: - Check_GuideItem(eItem.Fairy, true); - break; - - // 제일 앞 카드 말고 안 좋은 카드 - case ePurpose.EquipMagic: - Check_GuideItem(eItem.Skill, false); - break; - } - } - void Check_GuideItem(eItem item, bool findhigh) - { - if (m_type == item && ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideClear) == 0) - { - var card = findhigh ? Get_HighIDCard() : Get_LowIDCard_Not1(); - card.Set_GuideArrow(true); - MoveScroll(card.Get_ItemData().Get_ID()); - } - } - UIItemCard Get_HighIDCard() - { - UIItemCard HighItem = null; - for (int i = 0; i < list_CardBase.Count; i++) - { - var data = list_CardBase[i] as UIItemCard; - if (HighItem == null) - { - if (data.Get_ItemData().Lv > 0) - HighItem = data; - } - else - { - if (data.Get_ItemData().Lv > 0 && HighItem.Get_ItemData().Get_ID() < data.Get_ItemData().Get_ID()) - HighItem = data; - } - } - return HighItem; - } - UIItemCard Get_LowIDCard_Not1() - { - for (int ii = 0; ii < list_CardBase.Count; ii++) - { - var data = list_CardBase[ii] as UIItemCard; - if (data.Get_SkillTableData().ID != 1 && data.Get_ItemData().Lv > 0) - return data; - } - return null; - } - - public UIItemCard Get_Card_orNull(ItemData _id) - { - for (int i = 0; i < list_CardBase.Count; i++) - { - var card = list_CardBase[i] as UIItemCard; - if (card.Get_ItemData().Get_ID() == _id.Get_ID() && card.Get_ItemData().ItemType == _id.ItemType) - return card; - } - return null; - } - - public UIItemCard Get_PreNextCard_orNull(bool _ismix, bool _pre, int _id) - { - UIItemCard findcard = null; - int id; - if (_pre) - { - id = _id - 1; - if (_ismix) - { - if (id < 1) id = 24; - } - else - { - if (id < 1) id = 28; - } - } - else - { - id = _id + 1; - if (_ismix) - { - if (id > 24) id = 1; - } - else - { - if (id > 28) id = 1; - } - } - - for (int i = 0; i < list_CardBase.Count; i++) - { - var card = list_CardBase[i] as UIItemCard; - if (card.IsID(id)) - { - findcard = card; - break; - } - } - if (findcard != null) - { - findcard.Get_ItemData().Deck = Content_Equipment.Ins.m_Equipment_Left.m_DeckTabUI.Get_Tab(); - MoveScroll(id); - } - return findcard; - } - - void MoveScroll(int id) - { - // 스크롤뷰 이동 - Set_Coroutine(() => - { - var grade = MyValue.Get_GradebyID(id); - if (grade < eItemGrade.Unique) m_scrollview.SetDragAmount(0f, 0f, false); - else m_scrollview.SetDragAmount(0f, (int)grade / 7f, false); - }, Time.deltaTime); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/MenuEquipment/Equipment_Right.cs.meta b/Assets/Script/UI/MenuEquipment/Equipment_Right.cs.meta deleted file mode 100644 index 4d74984a6..000000000 --- a/Assets/Script/UI/MenuEquipment/Equipment_Right.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 683489458ca93154ebfe145837c2d42f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Shop/ShopCardBase.cs b/Assets/Script/UI/Shop/ShopCardBase.cs index 3f6055a82..3cea5290d 100644 --- a/Assets/Script/UI/Shop/ShopCardBase.cs +++ b/Assets/Script/UI/Shop/ShopCardBase.cs @@ -70,7 +70,7 @@ public class ShopCardBase : CardBase gos[0].SetActive(sdata.CanShow_ShopAD(m_ShopTableData.ID)); if (gos.Length > 4) gos[4].SetActive(m_ShopTableData.IsRocket); - if (go_guidearrow) go_guidearrow.SetActive(m_ShopTableData.PriceType == ePriceType.AD && m_ShopTableData.BuyLimit_Day == 1 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.FreePackage && sdata.Get_Common(eCommon.GuideClear) == 0); + //if (go_guidearrow) go_guidearrow.SetActive(m_ShopTableData.PriceType == ePriceType.AD && m_ShopTableData.BuyLimit_Day == 1 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.FreePackage && sdata.Get_Common(eCommon.GuideClear) == 0); } void Set_Limit() @@ -176,14 +176,14 @@ public class ShopCardBase : CardBase } else if (m_ShopTableData.PriceType == ePriceType.AD) { - if (m_ShopTableData.BuyLimit_Day == 1 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.FreePackage && sdata.Get_Common(eCommon.GuideClear) < 1) - { - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.FreePackage); - if (go_guidearrow) go_guidearrow.SetActive(false); - Buy_ShopAD(); - } - else if (sdata.CanShow_ShopAD(m_ShopTableData.ID)) - ADInfo.Ins.Show_AD(Buy_ShopAD); + //if (m_ShopTableData.BuyLimit_Day == 1 && NewGameUI.Ins.m_GuideQuestUI.Get_Purpose() == ePurpose.FreePackage && sdata.Get_Common(eCommon.GuideClear) < 1) + //{ + // NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.FreePackage); + // if (go_guidearrow) go_guidearrow.SetActive(false); + // Buy_ShopAD(); + //} + //else if (sdata.CanShow_ShopAD(m_ShopTableData.ID)) + // ADInfo.Ins.Show_AD(Buy_ShopAD); } else if (m_ShopTableData.PriceType == ePriceType.Review) { diff --git a/Assets/Script/UI/Stage/IngameChapterQuest.cs b/Assets/Script/UI/Stage/IngameChapterQuest.cs index 15f143e2e..32d8c427f 100644 --- a/Assets/Script/UI/Stage/IngameChapterQuest.cs +++ b/Assets/Script/UI/Stage/IngameChapterQuest.cs @@ -33,25 +33,7 @@ public class IngameChapterQuest : MonoBehaviour { switch (data.purpose) { - case ePurpose.FindChest: - if (data.chestid == LobbyChapterQuest.ChapterQuestData.ChestID) - Add_Count(data.addcount); - break; - case ePurpose.MeetMob: - case ePurpose.BossKill: - case ePurpose.MobKill: - if (data.mobid == LobbyChapterQuest.ChapterQuestData.MobID) - Add_Count(data.addcount); - break; - case ePurpose.GetItem: - if (LobbyChapterQuest.ChapterQuestData.ObjType != ChapterQuestObjType.None) - { - if (LobbyChapterQuest.ChapterQuestData.ObjType == data.objtype) - Add_Count(data.addcount); - } - else - Add_Count(data.addcount); - break; + default: Add_Count(data.addcount); break; @@ -66,11 +48,11 @@ public class IngameChapterQuest : MonoBehaviour labels[0].text = DSUtil.Format(LobbyChapterQuest.ChapterQuestData.PurposeText, m_PurposeCount); bool check; - if (LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time10Min || LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time15Min || LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time20Min) - check = m_PurposeCount <= LobbyChapterQuest.ChapterQuestData.Count && !gos[0].activeInHierarchy; - else if (LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.SaveNPC) - check = SaveNPCMgr.Ins.IsClearQuestMobs(); - else + //if (LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time10Min || LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time15Min || LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.Time20Min) + // check = m_PurposeCount <= LobbyChapterQuest.ChapterQuestData.Count && !gos[0].activeInHierarchy; + //else if (LobbyChapterQuest.ChapterQuestData.Purpose == ePurpose.SaveNPC) + //check = SaveNPCMgr.Ins.IsClearQuestMobs(); + //else check = m_PurposeCount == LobbyChapterQuest.ChapterQuestData.Count && !gos[0].activeInHierarchy; if (check) diff --git a/Assets/Script/UI/Stage/PauseUI.cs b/Assets/Script/UI/Stage/PauseUI.cs index a1c2f51d8..c9d520a6d 100644 --- a/Assets/Script/UI/Stage/PauseUI.cs +++ b/Assets/Script/UI/Stage/PauseUI.cs @@ -57,6 +57,6 @@ public class PauseUI : BackKeyAdd { base.OnClick_Back(); GameUI.Ins.IngameUI.m_StageResult.Set(false, true, InGameInfo.Ins.Return_To_Lobby); - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.DieOrQuit); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.DieOrQuit); } } \ No newline at end of file diff --git a/Assets/Script/UI/Stage/StageResult.cs b/Assets/Script/UI/Stage/StageResult.cs index 31f06f4fc..e0e484dc5 100644 --- a/Assets/Script/UI/Stage/StageResult.cs +++ b/Assets/Script/UI/Stage/StageResult.cs @@ -77,13 +77,13 @@ public class StageResult : BackKeyAdd //sdata.Add_Item(new ItemData(eItem.RoulletteTicket, 0, 1, "", eUICardType.GetItem)); - var achi = table_achievementsmission.Ins.Get_DataList(chapter); - if (curStage > 3) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage3Clear).n_MissionIndex); - if (curStage > 5) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage5Clear).n_MissionIndex); - if (curStage > 8) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage8Clear).n_MissionIndex); + //var achi = table_achievementsmission.Ins.Get_DataList(chapter); + //if (curStage > 3) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage3Clear).n_MissionIndex); + //if (curStage > 5) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage5Clear).n_MissionIndex); + //if (curStage > 8) sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.Stage8Clear).n_MissionIndex); - sdata.Add_MissionCount(MyValue.arr_Mission[0], 1); - sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.ChapterClear).n_MissionIndex); + //sdata.Add_MissionCount(MyValue.arr_Mission[0], 1); + //sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.ChapterClear).n_MissionIndex); //if (InGameInfo.Ins.m_Time <= 300f) //{ // var data = achi.Find(f => f.e_Purpose == ePurpose.Time5Min); diff --git a/Assets/Script/Util/MyEnum.cs b/Assets/Script/Util/MyEnum.cs index 5c8fbeea5..b5e0404c0 100644 --- a/Assets/Script/Util/MyEnum.cs +++ b/Assets/Script/Util/MyEnum.cs @@ -279,23 +279,63 @@ public enum NGUIAnchorSide { BottomLeft, Left, TopLeft, Top, TopRight, Right, Bo public enum eAttendance { CanGetDay, DoY, Max } public enum ePurpose { - AnyChapterClear, MobKill, BossKill, Summon_Weapon, Summon_Ring, Summon_Neck, Summon_Boots, Summon_Fairy, Summon_Pet, Summon_Magic, SowSeed, Harvest, PlayTime, WitchEnchant, PetEnchant, ShowAD, SelectSkill, CompleteDailyQuest, + KILL_MONSTER, + KILL_MONSTER_ALL, + KILL_MONSTER_ACC, + TAKE_GOODS, + CONSUME_GOODS, + MOVE_MAP, + MENU_OPEN, + ACCOUNT_LEVEL_UP, + ACCOUNT_LEVEL_UP_LIMIT, + MERGE_HERO, + MERGE_HERO_ACC, + GET_HERO, + UPGRADE_ABILITY, + UPGRADE_ABILITY_LIMIT, + UPGRADE_ABILITY_ALL, + UPGRADE_ABILITY_LIMIT_ALL, + GET_SKILL, + GET_SKILL_ALL, + SKILL_UPGRADE, + SKILL_UPGRADE_ALL, + SKILL_UPGRADE_LIMIT, + SKILL_UPGRADE_LIMIT_ALL, + SKILL_AWAKEN_ALL, + SKILL_AWAKEN_LIMIT_ALL, + GET_COMMANDER, + GET_EQUIPEMENT, + GET_EQUIPEMENT_ALL, + EQUIPEMENT_MOUNT_ALL, + EQUIPEMENT_UPGRADE_ALL, + EQUIPEMENT_UPGRADE_LIMIT_ALL, + EQUIPEMENT_AWAKEN_ALL, + EQUIPEMENT_AWAKEN_LIMIT_ALL, + ACHIEVEMENT_CLEAR_ALL, + DAILY_MISSION_CLEAR_ALL, + WEEKLY_MISSION_CLEAR_ALL, + RELIC_TAKE, + RELIC_TAKE_ALL, + RELIC_UPGRADE, + RELIC_UPGRADE_ALL, + RELIC_UPGRADE_LIMIT_ALL, + WATCH_AD, + WATCH_AD_ACC, + ATTENDANCE, + ATTENDANCE_ACC, + GACHA_EQUIPEMENT, + GACHA_SKILL, + GACHA_RELIC, + GACHA_ALL, + GACHA_ACC, + BUY_PRODUCT, + BUY_PRODUCT_ALL, + COMBATPOWER_LIMIT, + CHECK_PLAYTIME, + CHECK_PLAYTIME_ACC, + CONTENTS_CLEAR, + CONTENTS_CLEAR_ALL, - Reinforce_Weapon, Reinforce_Ring, Reinforce_Neck, Reinforce_Boots, Reinforce_Fairy, Reinforce_Magic, Reinforce_Pet, Mix_Weapon, Mix_Ring, Mix_Neck, Mix_Boots, Mix_Fairy, Mix_Pet, Mix_Magic, - Transcend_Weapon, Transcend_Ring, Transcend_Neck, Transcend_Boots, Transcend_Fairy, Transcend_Pet, Transcend_Magic, Enter_Mfield, Enter_Mforest, Enter_Mdungeon, Enter_Mwitch, Enter_MPetBattle, Make_Potion, Make_Relic, - - MakeBook, ObtainLegendWeapon, ObtainMythWeapon, ObtainLegendRing, ObtainMythRing, ObtainLegendNeck, ObtainMythNeck, ObtainLegendBoots, ObtainMythBoots, ObtainLegendFairy, ObtainMythFairy, ObtainLegendMagic, ObtainMythMagic, - BloomMagic, ObtainLegendPet, ObtainMythPet, - Stage3Clear, Stage5Clear, Stage8Clear, ChapterClear, Time20Min, Time15Min, Time10Min, Time5Min, - - // 챕터 퀘스트 - FindChest, SaveNPC, GetItem, MeetMob, - - // 가이드 퀘스트 - QuestEnter, JoystickAttack, JoystickChest, ScreenRot, AutoTarget, ShootMagic, AutoMagic, GetDropItem, Clear1_2, DieOrQuit, WitchStat, PetStat, GambleFairy, EqiupFairy, GamblePet, EquipPet, GambleMagic, EquipMagic, Clear1_5, Clear1_10, - MixRing, EnchantMagic, EnchantPet, FreePackage, CombinePotion, UsePotion, LookBook, UseGoldPouch, ChangeTitle, GetMissionReward, GetPass, OptionHelp, Coupon, GambleWeapon, EqiupWeapon, NickChange, ChapterChange, - Complete, - - Max + None } public enum eTime { LastConnect, DrawlotsAD_Equipment, DrawlotsAD_Party, Free_Gem, Free_Stone, Free_Potion, Free_PartyStone, Free_AvatarStone, Free_Ticket, Buff4_7Days, AD_7Days, SuperCarrot, Free_JPoint, Max } \ No newline at end of file diff --git a/Assets/Script/Util/RealCamera.cs b/Assets/Script/Util/RealCamera.cs index 86134c767..cb3052bfd 100644 --- a/Assets/Script/Util/RealCamera.cs +++ b/Assets/Script/Util/RealCamera.cs @@ -120,7 +120,7 @@ public class RealCamera : MyCoroutine DragEndTime = 1f; if (_horizontal) HorizontalAxis = _value; else VerticalAxis = _value; - NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ScreenRot); + //NewGameUI.Ins.m_GuideQuestUI.Add_GuideQuest(ePurpose.ScreenRot); } public void Set_AutoCam_byMyPC() {