diff --git a/Assets/ResWork/Table/Export/MissionList.json b/Assets/ResWork/Table/Export/MissionList.json index b2e58d68f..a6cf4ecb4 100644 --- a/Assets/ResWork/Table/Export/MissionList.json +++ b/Assets/ResWork/Table/Export/MissionList.json @@ -1 +1 @@ -[{"n_MissionIndex": "1", "n_MissionGroupId": "0", "e_LinkedQuestType": "None", "n_MissionDesc": "100034", "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", "e_LinkedQuestType": "None", "n_MissionDesc": "100001", "e_MissionConditionType": "KILL_MONSTER", "n_MissionConditionValue": "101", "l_MissionConditionCount": "20", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "100", "b_RepeatMission": "False"}, {"n_MissionIndex": "3", "n_MissionGroupId": "0", "e_LinkedQuestType": "None", "n_MissionDesc": "100002", "e_MissionConditionType": "KILL_MONSTER_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "30", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "200", "b_RepeatMission": "False"}, {"n_MissionIndex": "4", "n_MissionGroupId": "0", "e_LinkedQuestType": "First", "n_MissionDesc": "100003", "e_MissionConditionType": "KILL_MONSTER_ACC", "n_MissionConditionValue": "0", "l_MissionConditionCount": "40", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "300", "b_RepeatMission": "False"}] \ No newline at end of file +[{"n_MissionIndex": "1", "n_MissionGroupId": "1", "e_LinkedQuestType": "None", "n_MissionDesc": "100034", "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": "1", "e_LinkedQuestType": "None", "n_MissionDesc": "100001", "e_MissionConditionType": "KILL_MONSTER", "n_MissionConditionValue": "101", "l_MissionConditionCount": "20", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "100", "b_RepeatMission": "False"}, {"n_MissionIndex": "3", "n_MissionGroupId": "1", "e_LinkedQuestType": "None", "n_MissionDesc": "100002", "e_MissionConditionType": "KILL_MONSTER_ALL", "n_MissionConditionValue": "0", "l_MissionConditionCount": "30", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "200", "b_RepeatMission": "False"}, {"n_MissionIndex": "4", "n_MissionGroupId": "1", "e_LinkedQuestType": "First", "n_MissionDesc": "100003", "e_MissionConditionType": "KILL_MONSTER_ACC", "n_MissionConditionValue": "0", "l_MissionConditionCount": "40", "e_RewardType": "", "n_RewardValue": "2", "n_RewardCount": "300", "b_RepeatMission": "False"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 962ac87f6..9d14fa757 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 84cd26e31..9ffbddc05 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -93551,7 +93551,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 5743882714988958725} m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp m_MethodName: OnClick_Back m_Mode: 1 @@ -99234,7 +99234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 51799a2d6bc10b640aae655017607f39, type: 3} + m_Sprite: {fileID: 21300000, guid: 879272a025f95f346ae93e43f6bbdd0c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -107023,7 +107023,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} m_Name: m_EditorClassIdentifier: - m_localtextKey: 325 + m_localtextKey: 363 --- !u!1 &8746692329787001303 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Mission/MissionUI.cs b/Assets/Script/UI/Mission/MissionUI.cs index 9c09e222a..00ef50bcd 100644 --- a/Assets/Script/UI/Mission/MissionUI.cs +++ b/Assets/Script/UI/Mission/MissionUI.cs @@ -23,7 +23,7 @@ public class MissionUI : uScrollViewMgr public override void Set_UI() { - m_Complete.Set(table_missionlist.Ins.Get_CompleteData(m_Tab.Get_Index())); - Set_ScrollView(table_missionlist.Ins.Get_DataList(m_Tab.Get_Index())); + m_Complete.Set(table_missionlist.Ins.Get_CompleteData(m_Tab.Get_Index() + 1)); + Set_ScrollView(table_missionlist.Ins.Get_DataList(m_Tab.Get_Index() + 1)); } } \ No newline at end of file