Merge branch 'dev_money' into c1_newdev

# Conflicts: # attr.xlsx # buff.xlsx # daily_challenge_level.xlsx # skill.xlsx # strings/attr.xlsx # strings/task_type.xlsx # task_type.xlsx
2025-10-09 15:33:21 +08:00 · 2025-10-09 15:33:21 +08:00 · e9b5806ca2
commit e9b5806ca2
parent bbac4567b2 e46dd4fece
26 changed files with 0 additions and 0 deletions
--- a/act_bounty.xlsx
+++ b/act_bounty.xlsx
--- a/act_exchange.xlsx
+++ b/act_exchange.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/act_week_signin.xlsx
+++ b/act_week_signin.xlsx
--- a/activity.xlsx
+++ b/activity.xlsx
--- a/attr.xlsx
+++ b/attr.xlsx
--- a/bounty_level.xlsx
+++ b/bounty_level.xlsx
--- a/const.xlsx
+++ b/const.xlsx
--- a/func_open.xlsx
+++ b/func_open.xlsx
--- a/fund_chapter.xlsx
+++ b/fund_chapter.xlsx
--- a/fund_level.xlsx
+++ b/fund_level.xlsx
--- a/item.xlsx
+++ b/item.xlsx
--- a/mall_daily_store.xlsx
+++ b/mall_daily_store.xlsx
--- a/mall_gold.xlsx
+++ b/mall_gold.xlsx
--- a/mall_treasure.xlsx
+++ b/mall_treasure.xlsx
--- a/strings/act_gift.xlsx
+++ b/strings/act_gift.xlsx
--- a/strings/buff.xlsx
+++ b/strings/buff.xlsx
--- a/strings/global.xlsx
+++ b/strings/global.xlsx
--- a/strings/item.xlsx
+++ b/strings/item.xlsx
--- a/strings/task_type.xlsx
+++ b/strings/task_type.xlsx
--- a/summon.xlsx
+++ b/summon.xlsx
--- a/summon_shop.xlsx
+++ b/summon_shop.xlsx
--- a/task_type.xlsx
+++ b/task_type.xlsx