diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index f160a11d6..fc8494c9b 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 675f1deb3..e0816d736 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 82536ea82..c8d6cf253 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes b/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes index 0a4b6b5e6..a47ce5dec 100644 Binary files a/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes and b/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes differ diff --git a/Assets/lua/app/module/activity/act_sprint/act_sprint_manager.lua.bytes b/Assets/lua/app/module/activity/act_sprint/act_sprint_manager.lua.bytes index f08f713a4..afcf5e369 100644 Binary files a/Assets/lua/app/module/activity/act_sprint/act_sprint_manager.lua.bytes and b/Assets/lua/app/module/activity/act_sprint/act_sprint_manager.lua.bytes differ diff --git a/Assets/lua/app/module/summon/summon_manager.lua.bytes b/Assets/lua/app/module/summon/summon_manager.lua.bytes index 88f94e1ba..e624fb3b1 100644 Binary files a/Assets/lua/app/module/summon/summon_manager.lua.bytes and b/Assets/lua/app/module/summon/summon_manager.lua.bytes differ diff --git a/Assets/lua/app/module/task/task_const.lua.bytes b/Assets/lua/app/module/task/task_const.lua.bytes index 8d54e939b..b01252902 100644 Binary files a/Assets/lua/app/module/task/task_const.lua.bytes and b/Assets/lua/app/module/task/task_const.lua.bytes differ diff --git a/Assets/lua/app/module/task/task_manager.lua.bytes b/Assets/lua/app/module/task/task_manager.lua.bytes index 9f0aa75a1..68baa679d 100644 Binary files a/Assets/lua/app/module/task/task_manager.lua.bytes and b/Assets/lua/app/module/task/task_manager.lua.bytes differ diff --git a/Assets/lua/app/proto/proto_msg_type.lua.bytes b/Assets/lua/app/proto/proto_msg_type.lua.bytes index 91f708270..7848f9e69 100644 Binary files a/Assets/lua/app/proto/proto_msg_type.lua.bytes and b/Assets/lua/app/proto/proto_msg_type.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_sprint_main_ui.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_sprint_main_ui.lua.bytes index f169a44d4..7d4bf0206 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_sprint_main_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_sprint_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/standard_cell.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/standard_cell.lua.bytes index 9e057af4d..92ae3b7d2 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/standard_cell.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/standard_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/task_cell.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/task_cell.lua.bytes index 7e232d7b2..39b57e3eb 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/task_cell.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/cell/task_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/standard_comp.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/standard_comp.lua.bytes index d6f3d1646..e306d5007 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/standard_comp.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/standard_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/task_comp.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/task_comp.lua.bytes index 442237c9a..13e020104 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/task_comp.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/comp/task_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes index 6f9167412..b8beb827a 100644 Binary files a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes and b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/activity_data.lua.bytes b/Assets/lua/app/userdata/activity/activity_data.lua.bytes index d90b5af02..4ce919bbd 100644 Binary files a/Assets/lua/app/userdata/activity/activity_data.lua.bytes and b/Assets/lua/app/userdata/activity/activity_data.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_sprint/comp/standard_comp.prefab b/Assets/prefabs/ui/activity/act_sprint/comp/standard_comp.prefab index e7739b780..8c25b3541 100644 --- a/Assets/prefabs/ui/activity/act_sprint/comp/standard_comp.prefab +++ b/Assets/prefabs/ui/activity/act_sprint/comp/standard_comp.prefab @@ -2588,7 +2588,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b973c56581ae584c8b25c086b3f0e90, type: 3} + m_Sprite: {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/activity/act_sprint/comp/task_comp.prefab b/Assets/prefabs/ui/activity/act_sprint/comp/task_comp.prefab index 11f855c89..cd272940a 100644 --- a/Assets/prefabs/ui/activity/act_sprint/comp/task_comp.prefab +++ b/Assets/prefabs/ui/activity/act_sprint/comp/task_comp.prefab @@ -1819,7 +1819,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b973c56581ae584c8b25c086b3f0e90, type: 3} + m_Sprite: {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index b2a16efce..5a3e5c5d9 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -•£ +ᬠpb/proto/protocol.protocspb"' Act gifts ( 2 @@ -87,7 +87,48 @@ trigger_at (R triggerAt" ActivityRushExchangeRsp( err_code (2 .cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards" -costs ( 2 .cspb.RewardRcosts"Á +costs ( 2 .cspb.RewardRcosts"A +ActivityScoreTask, + task_data ( 2.cspb.ScoreTaskRtaskData"¸ + ScoreTask + activity_id (R +activityId +score (Rscore + total_score (R +totalScore +round (Rround# + round_claimed (R roundClaimed +claimed (Rclaimed"U +ActivityScoreTaskClaimReq + activity_id (R +activityId +task_id (RtaskId"¬ +ActivityScoreTaskClaimRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards" +costs ( 2 .cspb.RewardRcosts +task_ids (RtaskIds"A +ActivityScoreTaskRoundClaimReq + activity_id (R +activityId"r +ActivityScoreTaskRoundClaimRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards"; + ActivityTask+ + task_data ( 2.cspb.TaskDataRtaskData"K +TaskData + activity_id (R +activityId +data ( 2 +.cspb.TaskRdata"P +ActivityTaskClaimReq + activity_id (R +activityId +task_id (RtaskId"ƒ +ActivityTaskClaimRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards +task_ids (RtaskIds"Á ActLevelUpGift. gifts ( 2.cspb.ActLevelUpGiftInfoRgifts/ gold_gift_trigger_at (RgoldGiftTriggerAt @@ -1033,7 +1074,7 @@ player_ids ( 2.cspb.AuthRsp.PlayerIdsEntryR playerIds client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide"ý +skip_guide (R skipGuide"´ LoginRsp( err_code (2 .cspb.ErrCodeRerrCode! game_version ( R gameVersion @@ -1079,8 +1120,10 @@ formations4 activities# ( 2.cspb.ActivityR activities@ -task_achievement$ ( 2.cspb.TaskAchievementRtaskAchievement -actc ( 2 .cspb.ActRactN +task_achievement$ ( 2.cspb.TaskAchievementRtaskAchievementP +activity_rush_exchange% ( 2.cspb.ActivityRushExchangeRactivityRushExchangeG +activity_score_task& ( 2.cspb.ActivityScoreTaskRactivityScoreTask7 + activity_task' ( 2.cspb.ActivityTaskR activityTaskN FormationsEntry key (Rkey% value ( 2.cspb.FormationRvalue:8"U @@ -1322,7 +1365,7 @@ TasksEntry CHAT EMOJI -FRAMES*Ï +FRAMES*Ç ErrCode SUCCESS @@ -1340,8 +1383,8 @@ TasksEntry CFG_IS_NOT_FOUNDe ITEM_IS_NOT_ENOUGHf HERO_DOES_NOT_EXISTg -ITEM_TYPE_IS_NOT_MATCHEDh -EQUIP_DOES_NOT_EXISTi +ITEM_TYPE_IS_NOT_MATCHEDh + OBJECT_LIMITi OBJECT_NOT_EXISTj NAME_HAS_EXISTEDk PLAYER_LEVEL_NOT_ENOUGHl