Merge branch 'dev_newhero' into c1_newdev

# Conflicts: # act_week_signin.xlsx # attr.xlsx # board_dungeon.xlsx # chapter_dungeon.xlsx # const.xlsx # item.xlsx # monster_base.xlsx # strings/attr.xlsx # strings/global.xlsx # strings/item.xlsx # summon.xlsx # summon_shop.xlsx
2025-10-24 19:09:23 +08:00 · 2025-10-24 19:09:23 +08:00 · e692488074
commit e692488074
parent 689947fdb0 87b26ab9ba
22 changed files with 0 additions and 0 deletions
--- a/act_bounty.xlsx
+++ b/act_bounty.xlsx
--- a/act_gift.xlsx
+++ b/act_gift.xlsx
--- a/act_sevenday_quest.xlsx
+++ b/act_sevenday_quest.xlsx
--- a/act_sevenday_quest_reward.xlsx
+++ b/act_sevenday_quest_reward.xlsx
--- a/act_task.xlsx
+++ b/act_task.xlsx
--- a/activity.xlsx
+++ b/activity.xlsx
--- a/arena_gift.xlsx
+++ b/arena_gift.xlsx
--- a/arena_rank.xlsx
+++ b/arena_rank.xlsx
--- a/arena_robot.xlsx
+++ b/arena_robot.xlsx
--- a/avatar.xlsx
+++ b/avatar.xlsx
--- a/avatar_frame.xlsx
+++ b/avatar_frame.xlsx
--- a/daily_challenge_level.xlsx
+++ b/daily_challenge_level.xlsx
--- a/fund_chapter.xlsx
+++ b/fund_chapter.xlsx
--- a/fund_level.xlsx
+++ b/fund_level.xlsx
--- a/monster_dungeon.xlsx
+++ b/monster_dungeon.xlsx
--- a/strings/act_gift.xlsx
+++ b/strings/act_gift.xlsx
--- a/strings/avatar.xlsx
+++ b/strings/avatar.xlsx
--- a/strings/avatar_frame.xlsx
+++ b/strings/avatar_frame.xlsx
--- a/strings/equip.xlsx
+++ b/strings/equip.xlsx
--- a/task_achievement.xlsx
+++ b/task_achievement.xlsx
--- a/task_daily.xlsx
+++ b/task_daily.xlsx
--- a/task_daily_stage.xlsx
+++ b/task_daily_stage.xlsx