IOS2 activity adjust

yueyoum · Mar 9, 2016 · a951a31 · a951a31
1 parent 81a79e5
commit a951a31
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/sanguo/preset/fixtures/activity_static.json b/sanguo/preset/fixtures/activity_static.json
@@ -148,7 +148,7 @@
         "name": "\u7d2f\u79ef\u6d88\u8d39\u5f97\u5361\u9b42", 
         "continued_days": 6, 
         "current_des": "\u5f53\u524d\u5df2\u6d88\u8d39${0}\u5143\u5b9d", 
-        "start_time": "2016-03-08", 
+        "start_time": "2011-03-08", 
         "des": "\u6d3b\u52a8\u671f\u95f4\uff0c\u7d2f\u79ef\u6d88\u8d39\u5143\u5b9d\u8fbe\u5230\u6307\u5b9a\u6570\u91cf\u53ef\u4ee5\u83b7\u53d6\u9053\u5177\u3002\u8fbe\u5230\u6d88\u8d39\u989d\u5b9a\u6570\u91cf\u540e\u76f4\u63a5\u901a\u8fc7\u90ae\u4ef6\u53d1\u653e\u5956\u54c1\u3002", 
         "interval_times": 1, 
         "package": null, 
@@ -168,7 +168,7 @@
         "name": "\u9526\u56ca\u6362\u7a00\u6709\u6750\u6599", 
         "continued_days": 6, 
         "current_des": "\u5f53\u524d\u62e5\u6709\u9526\u56ca${0}\u4e2a", 
-        "start_time": "2016-03-08", 
+        "start_time": "2011-03-08", 
         "des": "\u6d3b\u52a8\u671f\u95f4\uff0c\u7cbe\u82f1\u526f\u672c\u6bcf\u6b21\u5fc5\u5b9a\u6389\u843d\u9526\u56ca\uff0c\u6536\u96c6\u4e00\u5b9a\u6570\u91cf\u9526\u56ca\u53ef\u4ee5\u9886\u53d6\u6307\u5b9a\u9053\u5177\u3002\u5956\u54c1\u9700\u8981\u73a9\u5bb6\u624b\u52a8\u5230\u6d3b\u52a8\u754c\u9762\u9886\u53d6\u3002", 
         "interval_times": 0, 
         "package": null, 
@@ -248,7 +248,7 @@
         "name": "\u7cbe\u82f1\u526f\u672c\u5f97\u9526\u56ca", 
         "continued_days": 6, 
         "current_des": "\u5f53\u524d\u62e5\u6709\u9526\u56ca${0}\u4e2a", 
-        "start_time": "2016-03-08", 
+        "start_time": "2011-03-08", 
         "des": "\u6d3b\u52a8\u671f\u95f4\uff0c\u7cbe\u82f1\u526f\u672c\u6bcf\u6b21\u5fc5\u5b9a\u6389\u843d\u9526\u56ca\uff0c\u4f7f\u7528\u9526\u56ca\uff0c\u968f\u673a\u83b7\u5f97\u4e0d\u540c\u5956\u52b1\u3002", 
         "interval_times": 0, 
         "package": 50015, 
@@ -308,7 +308,7 @@
         "name": "\u5145\u503c\u5927\u8fd4\u73b0", 
         "continued_days": 6, 
         "current_des": "\u5f53\u524d\u5df2\u7d2f\u79ef\u5145\u503c${0}", 
-        "start_time": "2016-03-08", 
+        "start_time": "2011-03-08", 
         "des": "\u7d2f\u79ef\u5145\u503c\u5927\u8fd4\u73b0", 
         "interval_times": 0, 
         "package": null, 
@@ -426,7 +426,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u7d2f\u79ef\u767b\u9646\u9001\u5927\u793c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524d\u5df2\u767b\u5f55\u5929\u6570\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u7d2f\u79ef\u767b\u96465\u5929\uff0c\u5c06\u6709\u5927\u793c\u76f8\u9001", 
@@ -446,7 +446,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u88c5\u5907\u8fdb\u9636\u6709\u597d\u793c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5df2\u8fdb\u9636\u6b21\u6570\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u7d2f\u79ef\u8fdb\u884c20\u6b21\u88c5\u5907\u8fdb\u9636\uff0c\u5c06\u6709\u597d\u793c\u53ef\u62ff", 
@@ -466,7 +466,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u6b66\u5c06\u8fdb\u9636\u9001\u8c6a\u793c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5df2\u8fdb\u9636\u6b21\u6570:${0}", 
         "start_time": "2016-03-07", 
         "des": "\u7d2f\u79ef\u8fdb\u884c8\u6b21\u6b66\u5c06\u8fdb\u9636\uff0c\u5c06\u6709\u60ca\u559c\u53ef\u62ff", 
@@ -486,7 +486,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u7cbe\u82f1\u526f\u672c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u7cbe\u82f1\u526f\u672c\u901a\u5173\u6b21\u6570\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u7d2f\u79ef\u901a\u517350\u6b21\u7cbe\u82f1\u526f\u672c\uff0c\u5c06\u6709\u60ca\u559c\u53ef\u9886\u53d6", 
@@ -506,7 +506,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u7d2f\u79ef\u5145\u503c\u6709\u60ca\u559c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524d\u5df2\u5145\u503c\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u7d2f\u79ef\u5145\u503c980\u5143\u5b9d\u5c06\u6709\u5927\u793c\u53ef\u62ff", 
@@ -526,7 +526,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u653b\u57ce\u7565\u5730", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524d\u5df2\u63a0\u593a\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u6210\u529f\u63a0\u593a50\u6b21\uff0c\u6d77\u91cf\u94f6\u4e24\u9001\u4e0d\u505c", 
@@ -546,7 +546,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u5143\u5b9d\u70b9\u5c06\u9001\u5927\u793c", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524d\u5df2\u70b9\u5c06\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u4f7f\u7528\u5143\u5b9d\u70b9\u5c0615\u6b21\uff0c\u571f\u58d5\u5927\u793c\u9001\u4e0d\u505c", 
@@ -564,9 +564,9 @@
     "model": "activity.activitystatic", 
     "fields": {
         "category": 2, 
-        "interval_days": 0, 
+        "interval_days": 15, 
         "name": "\u4e94\u661f\u6218\u5c06\u964d\u4e34", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5df2\u6709\u6311\u6218\u4e66:${0}", 
         "start_time": "2016-03-07", 
         "des": "\u4f7f\u7528\u6b66\u5c06\u6311\u6218\u4e66\uff0c\u4e94\u661f\u6218\u5c06\u8ddf\u4f60\u8d70", 
@@ -586,7 +586,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u5355\u7b14\u5145\u503c\u793c\u5305", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5956\u52b1\u9886\u53d6\u6b21\u6570\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u5355\u7b14\u5145\u503c198\u4ee5\u4e0a\uff0c\u53ef\u9886\u53d6\u8700\u56fd\u793c\u5305\uff0c\u6d3b\u52a8\u671f\u95f4\u6bcf\u4f4d\u73a9\u5bb6\u6700\u591a\u9886\u53d610\u6b21", 
@@ -606,7 +606,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u7d2f\u79ef\u5145\u503c\u5956\u52b1", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524d\u5145\u503c\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "\u6d3b\u52a8\u671f\u95f4\u7d2f\u8ba1\u5145\u503c\u6307\u5b9a\u91d1\u989d\u5373\u53ef\u9886\u53d6\u5956\u52b1", 
@@ -626,7 +626,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "\u6d3b\u52a8\u526f\u672c\u5927\u5f00\u653e", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u6311\u6218\u6b21\u6570\u7ffb\u500d", 
         "start_time": "2016-03-07", 
         "des": "\u6d3b\u52a8\u671f\u95f4\uff0c\u65e5\u5e38\u6d3b\u52a8\u526f\u672c\u6311\u6218\u6b21\u6570\u7ffb\u500d", 
@@ -646,7 +646,7 @@
         "category": 2, 
         "interval_days": 0, 
         "name": "VIP\u798f\u5229\u6d3b\u52a8", 
-        "continued_days": 0, 
+        "continued_days": 15, 
         "current_des": "\u5f53\u524dVIP\u7b49\u7ea7\uff1a${0}", 
         "start_time": "2016-03-07", 
         "des": "VIP6\u4ee5\u4e0a\u73a9\u5bb6\u6d3b\u52a8\u671f\u95f4\u6bcf\u5929\u53ef\u4ee5\u9886\u53d6188\u5143\u5b9d\uff0b8888\u94f6\u4e24", 

diff --git a/sanguo/preset/fixtures/activity_static_condition.json b/sanguo/preset/fixtures/activity_static_condition.json
@@ -1205,7 +1205,7 @@
         "package": 180097, 
         "des": "\u7d2f\u79ef\u5145\u503c6000\u5143\u5b9d", 
         "condition_ids": "", 
-        "icon_one_amount": 500, 
+        "icon_one_amount": 50, 
         "icon_three_amount": 25, 
         "icon_two_type": 7, 
         "icon_one_type": 6, 

diff --git a/sanguo/preset/fixtures/stuffs.json b/sanguo/preset/fixtures/stuffs.json
@@ -1156,7 +1156,7 @@
     "model": "item.stuff", 
     "fields": {
         "name": "\u6b66\u5c06\u6311\u6218\u4e66", 
-        "tip_des": "\u6d3b\u52a8\u671f\u95f4\u96c6\u9f50\u76f8\u5e94\u6570\u91cf\u53ef\u4ee5\u5151\u6362\u4e94\u661f\u6b66\u5c06", 
+        "tip_des": "\u6d3b\u52a8\u671f\u95f4\u96c6\u9f50\u76f8\u5e94\u6570\u91cf\u53ef\u4ee5\u5151\u6362\u91d1\u8272\u6b66\u5c06\u5b9d\u7bb1", 
         "tip_type": "\u6b66\u5c06\u6311\u6218\u4e66", 
         "des": "\u9526\u56ca", 
         "buy_sycee": 0,