zg преди 1 месец
родител
ревизия
91b74743d2

+ 28 - 40
Assets/Res/Config/EventConfig.json

@@ -12,11 +12,11 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 3,
       "EventValue": [
-        0
+        5
       ],
       "EventCount": null,
       "EventName": 174,
@@ -36,12 +36,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -57,16 +54,16 @@
         1025,
         1026
       ],
-      "EventTriggerType": 3,
+      "EventTriggerType": 99,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 1,
       "EventValue": [
-        0
+        10007
       ],
-      "EventCount": null,
+      "EventCount": 1,
       "EventName": 176,
       "Description": 1938
     },
@@ -78,11 +75,11 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
+      "EventConditionId": 7,
       "EventValue": [
-        0
+        500
       ],
       "EventCount": null,
       "EventName": 217,
@@ -96,12 +93,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 218,
       "Description": 1940
@@ -114,12 +108,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 219,
       "Description": 1941
@@ -132,12 +123,9 @@
       "EventTriggerType": 1,
       "EventTag": null,
       "EventType": 2,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 0,
-      "EventValue": [
-        0
-      ],
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 220,
       "Description": 1942
@@ -150,7 +138,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -165,7 +153,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -180,7 +168,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -195,7 +183,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -210,7 +198,7 @@
       "EventTriggerType": 2,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -225,7 +213,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -240,7 +228,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -255,7 +243,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,
@@ -270,7 +258,7 @@
       "EventTriggerType": 4,
       "EventTag": null,
       "EventType": 1,
-      "Score": 1,
+      "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
       "EventCount": null,

+ 3 - 3
Assets/Res/Config/EventLinkConfig.json

@@ -268,7 +268,7 @@
       ],
       "ConditionType": 1,
       "ConditionPara": [
-        1002
+        10007
       ],
       "finishCount": 1,
       "optionType": 4,
@@ -554,7 +554,7 @@
       "ConditionPara": [
         1001
       ],
-      "finishCount": 1,
+      "finishCount": 1000,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -568,7 +568,7 @@
       "ConditionPara": [
         10
       ],
-      "finishCount": 1,
+      "finishCount": null,
       "optionType": null,
       "ResultType": null
     }

+ 15 - 39
Assets/Res/Config/PlacesConfig.json

@@ -7,17 +7,23 @@
       "bigMapID": 1,
       "to3DPrefab": "a",
       "placeDesc": null,
-      "TotalScore": null,
+      "TotalScore": 4,
+      "MainTaskID": [
+        10001,
+        10002,
+        10003,
+        10004
+      ],
       "ZhixianID": [
-        10,
-        15,
-        20
+        3
+      ],
+      "ZhixianActivatedPercentage": [
+        25
       ],
       "DivineSenseGeneralProbability": 40,
       "SpecialTaskID": [
         1,
-        2,
-        3
+        2
       ]
     },
     {
@@ -28,17 +34,7 @@
       "to3DPrefab": "b",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 3,
@@ -48,17 +44,7 @@
       "to3DPrefab": "c",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 4,
@@ -68,17 +54,7 @@
       "to3DPrefab": "h",
       "placeDesc": null,
       "TotalScore": null,
-      "ZhixianID": [
-        10,
-        15,
-        20
-      ],
-      "DivineSenseGeneralProbability": 40,
-      "SpecialTaskID": [
-        1,
-        2,
-        3
-      ]
+      "DivineSenseGeneralProbability": null
     },
     {
       "ID": 5,

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Maps.xlsx