From 89d427c7c3bbcb36a3e48a60d2f6520bbf12f9da Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 07 十一月 2025 14:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Config/DailyTask.txt | 2 +-
Config/Item.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config/DailyTask.txt b/Config/DailyTask.txt
index 324309a..d291a67 100644
--- a/Config/DailyTask.txt
+++ b/Config/DailyTask.txt
@@ -1,6 +1,6 @@
int int int[] int int string int
TaskID TaskType TaskConds NeedValue AwardLiveness Title GuideID
-浠诲姟ID 浠诲姟绫诲瀷 浠诲姟鏉′欢 鎵�闇�浠诲姟鍊� 濂栧姳娲昏穬搴� 浠诲姟鍚� 寮曞ID
+浠诲姟ID 浠诲姟绫诲瀷 浠诲姟鏉′欢 鎵�闇�浠诲姟鍊� 濂栧姳娲昏穬搴﹀簾寮� 浠诲姟鍚� 寮曞ID
1 1 20 10 鍑昏触{0}鍙�墿 38
2 1 50 10 鍑昏触{0}鍙�墿 38
3 2 20 10 鍒嗚В瑁呭{0}娆� 38
diff --git a/Config/Item.txt b/Config/Item.txt
index 0d0e879..e4a2b5b 100644
--- a/Config/Item.txt
+++ b/Config/Item.txt
@@ -26,7 +26,7 @@
101 1 灏嗘槦鐜夐珦 15 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 TB_WP_JXYS 瑁呭鍒嗚В鑾峰緱锛屽彲鐢ㄤ簬绁濈鍝佽川鍗囩骇 0 0 1029
102 1 閲戝竵 15 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 TB_WP_JB 闂棯鍙戝厜鐨勯噾甯侊紝鏄笘鐣岄�氱敤鐨勮揣甯侊紝鍙互鍦ㄥ晢搴椾腑璐拱鐗╁搧銆� 0 0 1030
103 1 鎸戞垬鍑瘉 15 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 TB_WP_TZL 鍏佽鍙備笌鎿傚彴鐨勫嚟璇侊紝姣忔寫鎴樹竴娆℃秷鑰椾竴寮� 0 0 1029
-104 1 姣忔棩娲昏穬搴� 15 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 TB_WP_MRJF 瀹屾垚姣忔棩浠诲姟鍙幏寰椼�� 0 0
+104 1 姣忔棩娲昏穬搴� 15 0 2000000000 1 0 0 0 281 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 TB_WP_MRJF 瀹屾垚姣忔棩浠诲姟鍙幏寰椼�� 0 0
1000 1 榄忓浗姝﹀皢瀹濈 81 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 mainui_img_6 鍙幏寰楋細鏇瑰┐*1銆佷箰杩�*1 0 0 1029
1001 1 榄忓浗姝﹀皢闅忔満瀹濈 81 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 mainui_img_6 鍙幏寰楋細闅忔満榄忓浗姝﹀皢*1 0 0 1029
1002 1 榄忓浗姝﹀皢鑷�夊疂绠� 81 0 2000000000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 mainui_img_6 鍙嚜閫変换鎰忛瓘鍥芥灏�*1 0 0 1030
--
Gitblit v1.8.0