diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 5b5368c96..2e42506a5 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -26306,5 +26306,27 @@
18
],
"filter2": []
+ },
+ {
+ "id": 80000001,
+ "rtype": 2,
+ "ctype": 3,
+ "notify": [],
+ "type_sp": 1,
+ "tasktxt": {
+ "key": "buried_buried_condi_tasktxt_938",
+ "text": "当日消耗100点体力"
+ },
+ "type": 209,
+ "valid": 0,
+ "head": {
+ "a": "attr",
+ "t": "gold",
+ "n": 2
+ },
+ "NPC": 0,
+ "value": 100,
+ "filter": [],
+ "filter2": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 271a4e27e..d0921860b 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1187,5 +1187,10 @@
"id": 208,
"insert": 2,
"filter": []
+ },
+ {
+ "id": 209,
+ "insert": 3,
+ "filter": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 64e89e3d8..b616b0165 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -802,6 +802,15 @@
],
"venturegifts_draw": "23000001",
"gift_buy": 1002,
- "herostorycd": 48
+ "herostorycd": 48,
+ "Passcheck4_GetLvCos": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ "PasscheckPro4_UpLv": 30,
+ "Passcheck4_WeekMaxExp": 3000,
+ "Passcheck4_DayNum": 3,
+ "Passcheck4_WeekNum": 6
}
]
\ No newline at end of file
diff --git a/bin/json/game_passcheck.json b/bin/json/game_passcheck.json
index 4a7f9f6ac..af4d36b0a 100644
--- a/bin/json/game_passcheck.json
+++ b/bin/json/game_passcheck.json
@@ -17,7 +17,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10002,
@@ -37,7 +39,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10003,
@@ -57,7 +61,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10004,
@@ -77,7 +83,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10005,
@@ -97,7 +105,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10006,
@@ -117,7 +127,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10007,
@@ -137,7 +149,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10008,
@@ -157,7 +171,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10009,
@@ -177,7 +193,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 10010,
@@ -197,7 +215,9 @@
"t": "diamond",
"n": 300
},
- "pay_id": "passcheck_1"
+ "pay_id": "passcheck_1",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20001,
@@ -217,7 +237,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20002,
@@ -237,7 +259,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20003,
@@ -257,7 +281,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20004,
@@ -277,7 +303,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20005,
@@ -297,7 +325,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20006,
@@ -317,7 +347,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20007,
@@ -337,7 +369,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20008,
@@ -357,7 +391,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20009,
@@ -377,7 +413,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20010,
@@ -397,7 +435,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20011,
@@ -417,7 +457,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20012,
@@ -437,7 +479,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20013,
@@ -457,7 +501,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20014,
@@ -477,7 +523,9 @@
"t": "10000001",
"n": 5
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
},
{
"id": 20015,
@@ -497,6 +545,1152 @@
"t": "10000001",
"n": 10
},
- "pay_id": "passcheck_2"
+ "pay_id": "passcheck_2",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30001,
+ "passcheck_type": 3,
+ "parameter": 1,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30001",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30002,
+ "passcheck_type": 3,
+ "parameter": 2,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30002",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30003,
+ "passcheck_type": 3,
+ "parameter": 3,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30003",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30004,
+ "passcheck_type": 3,
+ "parameter": 4,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30004",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30005,
+ "passcheck_type": 3,
+ "parameter": 5,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30005",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30006,
+ "passcheck_type": 3,
+ "parameter": 6,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30006",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 30007,
+ "passcheck_type": 3,
+ "parameter": 7,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_30007",
+ "text": "登录{0}天"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_3",
+ "paypro_id": "",
+ "paymid_id": ""
+ },
+ {
+ "id": 40001,
+ "passcheck_type": 4,
+ "parameter": 1,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40001",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40002,
+ "passcheck_type": 4,
+ "parameter": 2,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40002",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40003,
+ "passcheck_type": 4,
+ "parameter": 3,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40003",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40004,
+ "passcheck_type": 4,
+ "parameter": 4,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40004",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40005,
+ "passcheck_type": 4,
+ "parameter": 5,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40005",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40006,
+ "passcheck_type": 4,
+ "parameter": 6,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40006",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40007,
+ "passcheck_type": 4,
+ "parameter": 7,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40007",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40008,
+ "passcheck_type": 4,
+ "parameter": 8,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40008",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40009,
+ "passcheck_type": 4,
+ "parameter": 9,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40009",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40010,
+ "passcheck_type": 4,
+ "parameter": 10,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40010",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40011,
+ "passcheck_type": 4,
+ "parameter": 11,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40011",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40012,
+ "passcheck_type": 4,
+ "parameter": 12,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40012",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40013,
+ "passcheck_type": 4,
+ "parameter": 13,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40013",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40014,
+ "passcheck_type": 4,
+ "parameter": 14,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40014",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40015,
+ "passcheck_type": 4,
+ "parameter": 15,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40015",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40016,
+ "passcheck_type": 4,
+ "parameter": 16,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40016",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40017,
+ "passcheck_type": 4,
+ "parameter": 17,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40017",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40018,
+ "passcheck_type": 4,
+ "parameter": 18,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40018",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40019,
+ "passcheck_type": 4,
+ "parameter": 19,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40019",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40020,
+ "passcheck_type": 4,
+ "parameter": 20,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40020",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40021,
+ "passcheck_type": 4,
+ "parameter": 21,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40021",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40022,
+ "passcheck_type": 4,
+ "parameter": 22,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40022",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40023,
+ "passcheck_type": 4,
+ "parameter": 23,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40023",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40024,
+ "passcheck_type": 4,
+ "parameter": 24,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40024",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40025,
+ "passcheck_type": 4,
+ "parameter": 25,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40025",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40026,
+ "passcheck_type": 4,
+ "parameter": 26,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40026",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40027,
+ "passcheck_type": 4,
+ "parameter": 27,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40027",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40028,
+ "passcheck_type": 4,
+ "parameter": 28,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40028",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40029,
+ "passcheck_type": 4,
+ "parameter": 29,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40029",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40030,
+ "passcheck_type": 4,
+ "parameter": 30,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40030",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40031,
+ "passcheck_type": 4,
+ "parameter": 31,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40031",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40032,
+ "passcheck_type": 4,
+ "parameter": 32,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40032",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40033,
+ "passcheck_type": 4,
+ "parameter": 33,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40033",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40034,
+ "passcheck_type": 4,
+ "parameter": 34,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40034",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40035,
+ "passcheck_type": 4,
+ "parameter": 35,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40035",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40036,
+ "passcheck_type": 4,
+ "parameter": 36,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40036",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40037,
+ "passcheck_type": 4,
+ "parameter": 37,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40037",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40038,
+ "passcheck_type": 4,
+ "parameter": 38,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40038",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40039,
+ "passcheck_type": 4,
+ "parameter": 39,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40039",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40040,
+ "passcheck_type": 4,
+ "parameter": 40,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40040",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40041,
+ "passcheck_type": 4,
+ "parameter": 41,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40041",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40042,
+ "passcheck_type": 4,
+ "parameter": 42,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40042",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40043,
+ "passcheck_type": 4,
+ "parameter": 43,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40043",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40044,
+ "passcheck_type": 4,
+ "parameter": 44,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40044",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
+ },
+ {
+ "id": 40045,
+ "passcheck_type": 4,
+ "parameter": 45,
+ "unlock_text": {
+ "key": "passcheck_passcheck_unlock_text_40045",
+ "text": "{0}级"
+ },
+ "free_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "pay_reward": {
+ "a": "item",
+ "t": "10000001",
+ "n": 5
+ },
+ "pay_id": "passcheck_4",
+ "paypro_id": "passcheckPro_4",
+ "paymid_id": "passcheckMid_4"
}
]
\ No newline at end of file
diff --git a/bin/json/game_paygiftpack.json b/bin/json/game_paygiftpack.json
index 5690fa34c..eae30e796 100644
--- a/bin/json/game_paygiftpack.json
+++ b/bin/json/game_paygiftpack.json
@@ -188,5 +188,71 @@
"n": 10
}
]
+ },
+ {
+ "id": 20008,
+ "type": 2,
+ "type2": 104,
+ "day": 0,
+ "repeat_num": 3,
+ "refreshtime": 30,
+ "packagetype": "passcheck_9",
+ "buy_num": 3,
+ "packagename": {
+ "key": "paypackage_paypackage_packagename_20008",
+ "text": "限时礼包1"
+ },
+ "costitem": [],
+ "item": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "id": 20009,
+ "type": 2,
+ "type2": 104,
+ "day": 0,
+ "repeat_num": 3,
+ "refreshtime": 30,
+ "packagetype": "passcheck_9",
+ "buy_num": 3,
+ "packagename": {
+ "key": "paypackage_paypackage_packagename_20009",
+ "text": "限时礼包2"
+ },
+ "costitem": [],
+ "item": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 11
+ }
+ ]
+ },
+ {
+ "id": 20010,
+ "type": 2,
+ "type2": 104,
+ "day": 0,
+ "repeat_num": 3,
+ "refreshtime": 30,
+ "packagetype": "passcheck_9",
+ "buy_num": 3,
+ "packagename": {
+ "key": "paypackage_paypackage_packagename_20010",
+ "text": "限时礼包3"
+ },
+ "costitem": [],
+ "item": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 12
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json
index a9a5943e2..b8086093d 100644
--- a/bin/json/game_playerlv.json
+++ b/bin/json/game_playerlv.json
@@ -185,7 +185,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 78,
- "hero_lv": 20,
+ "hero_lv": 25,
"guild_boss_ceiling": 1
},
{
@@ -205,7 +205,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 80,
- "hero_lv": 20,
+ "hero_lv": 25,
"guild_boss_ceiling": 1
},
{
@@ -225,7 +225,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 82,
- "hero_lv": 20,
+ "hero_lv": 25,
"guild_boss_ceiling": 1
},
{
@@ -245,7 +245,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 84,
- "hero_lv": 20,
+ "hero_lv": 25,
"guild_boss_ceiling": 1
},
{
@@ -265,7 +265,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 86,
- "hero_lv": 20,
+ "hero_lv": 25,
"guild_boss_ceiling": 1
},
{
@@ -305,7 +305,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 90,
- "hero_lv": 25,
+ "hero_lv": 30,
"guild_boss_ceiling": 1
},
{
@@ -325,7 +325,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 92,
- "hero_lv": 25,
+ "hero_lv": 30,
"guild_boss_ceiling": 1
},
{
@@ -345,7 +345,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 94,
- "hero_lv": 25,
+ "hero_lv": 30,
"guild_boss_ceiling": 1
},
{
@@ -365,7 +365,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 96,
- "hero_lv": 25,
+ "hero_lv": 30,
"guild_boss_ceiling": 1
},
{
@@ -385,7 +385,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 98,
- "hero_lv": 25,
+ "hero_lv": 30,
"guild_boss_ceiling": 1
},
{
@@ -405,7 +405,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 100,
- "hero_lv": 30,
+ "hero_lv": 35,
"guild_boss_ceiling": 1
},
{
@@ -425,7 +425,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 102,
- "hero_lv": 30,
+ "hero_lv": 35,
"guild_boss_ceiling": 1
},
{
@@ -445,7 +445,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 104,
- "hero_lv": 30,
+ "hero_lv": 35,
"guild_boss_ceiling": 1
},
{
@@ -465,7 +465,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 106,
- "hero_lv": 30,
+ "hero_lv": 35,
"guild_boss_ceiling": 1
},
{
@@ -485,7 +485,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 108,
- "hero_lv": 30,
+ "hero_lv": 35,
"guild_boss_ceiling": 1
},
{
@@ -505,7 +505,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 110,
- "hero_lv": 35,
+ "hero_lv": 40,
"guild_boss_ceiling": 1
},
{
@@ -525,7 +525,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 112,
- "hero_lv": 35,
+ "hero_lv": 40,
"guild_boss_ceiling": 1
},
{
@@ -545,7 +545,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 114,
- "hero_lv": 35,
+ "hero_lv": 40,
"guild_boss_ceiling": 1
},
{
@@ -565,7 +565,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 116,
- "hero_lv": 35,
+ "hero_lv": 40,
"guild_boss_ceiling": 1
},
{
@@ -585,7 +585,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 118,
- "hero_lv": 35,
+ "hero_lv": 40,
"guild_boss_ceiling": 1
},
{
@@ -605,7 +605,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 120,
- "hero_lv": 40,
+ "hero_lv": 45,
"guild_boss_ceiling": 1
},
{
@@ -625,7 +625,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 122,
- "hero_lv": 40,
+ "hero_lv": 45,
"guild_boss_ceiling": 1
},
{
@@ -645,7 +645,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 124,
- "hero_lv": 40,
+ "hero_lv": 45,
"guild_boss_ceiling": 1
},
{
@@ -665,7 +665,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 126,
- "hero_lv": 40,
+ "hero_lv": 45,
"guild_boss_ceiling": 1
},
{
@@ -685,7 +685,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 128,
- "hero_lv": 40,
+ "hero_lv": 45,
"guild_boss_ceiling": 1
},
{
@@ -705,8 +705,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 130,
- "hero_lv": 45,
- "guild_boss_ceiling": 1
+ "hero_lv": 50,
+ "guild_boss_ceiling": 2
},
{
"lv": 37,
@@ -725,8 +725,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 132,
- "hero_lv": 45,
- "guild_boss_ceiling": 1
+ "hero_lv": 50,
+ "guild_boss_ceiling": 2
},
{
"lv": 38,
@@ -745,8 +745,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 134,
- "hero_lv": 45,
- "guild_boss_ceiling": 1
+ "hero_lv": 50,
+ "guild_boss_ceiling": 2
},
{
"lv": 39,
@@ -765,8 +765,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 136,
- "hero_lv": 45,
- "guild_boss_ceiling": 1
+ "hero_lv": 50,
+ "guild_boss_ceiling": 2
},
{
"lv": 40,
@@ -785,7 +785,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 138,
- "hero_lv": 45,
+ "hero_lv": 50,
"guild_boss_ceiling": 2
},
{
@@ -805,7 +805,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 140,
- "hero_lv": 50,
+ "hero_lv": 55,
"guild_boss_ceiling": 2
},
{
@@ -825,7 +825,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 142,
- "hero_lv": 50,
+ "hero_lv": 55,
"guild_boss_ceiling": 2
},
{
@@ -845,7 +845,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 144,
- "hero_lv": 50,
+ "hero_lv": 55,
"guild_boss_ceiling": 2
},
{
@@ -865,7 +865,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 146,
- "hero_lv": 50,
+ "hero_lv": 55,
"guild_boss_ceiling": 2
},
{
@@ -885,7 +885,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 148,
- "hero_lv": 50,
+ "hero_lv": 55,
"guild_boss_ceiling": 2
},
{
@@ -905,8 +905,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 150,
- "hero_lv": 55,
- "guild_boss_ceiling": 2
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 47,
@@ -925,8 +925,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 152,
- "hero_lv": 55,
- "guild_boss_ceiling": 2
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 48,
@@ -945,8 +945,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 154,
- "hero_lv": 55,
- "guild_boss_ceiling": 2
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 49,
@@ -965,8 +965,8 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 156,
- "hero_lv": 55,
- "guild_boss_ceiling": 2
+ "hero_lv": 60,
+ "guild_boss_ceiling": 3
},
{
"lv": 50,
@@ -985,7 +985,7 @@
],
"ps_ceiling": 240,
"cops_ps_ceiling": 158,
- "hero_lv": 55,
+ "hero_lv": 60,
"guild_boss_ceiling": 3
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 786cd9e82..2338a0abe 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -1290,7 +1290,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1323,7 +1324,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1351,7 +1353,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1382,7 +1385,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1410,7 +1414,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1438,7 +1443,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1469,7 +1475,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1497,7 +1504,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1528,7 +1536,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -1560,7 +1569,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 1
],
"AddEffect": true,
"RemoveType": false,
@@ -1621,7 +1630,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 2
+ 2,
+ 1
],
"AddEffect": false,
"RemoveType": false,
@@ -1741,7 +1751,8 @@
"CoexistCheckArgu": [],
"Effect": [
1,
- 6
+ 6,
+ 0
],
"AddEffect": false,
"RemoveType": true,
@@ -1803,7 +1814,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1834,7 +1845,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1865,7 +1876,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1896,7 +1907,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1927,7 +1938,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1958,7 +1969,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -1989,7 +2000,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2020,7 +2031,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2051,7 +2062,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2082,7 +2093,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2113,7 +2124,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2144,7 +2155,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2175,7 +2186,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2206,7 +2217,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2237,7 +2248,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2268,7 +2279,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2299,7 +2310,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2330,7 +2341,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2361,7 +2372,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2392,7 +2403,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2423,7 +2434,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2454,7 +2465,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2485,7 +2496,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2516,7 +2527,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2547,7 +2558,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2578,7 +2589,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2609,7 +2620,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -2674,7 +2685,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -2704,7 +2715,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -2768,7 +2779,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -2861,7 +2872,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -2891,7 +2902,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -2981,7 +2992,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3130,7 +3141,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1,
+ 0,
6
],
"AddEffect": false,
@@ -3161,7 +3172,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3252,7 +3263,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3310,7 +3321,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 0
+ 0,
+ 3
],
"AddEffect": false,
"RemoveType": false,
@@ -3372,7 +3384,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3402,7 +3415,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3433,7 +3446,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3461,7 +3474,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3493,7 +3506,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1,
+ 0,
6
],
"AddEffect": false,
@@ -3524,7 +3537,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 3,
+ 0
],
"AddEffect": false,
"RemoveType": true,
@@ -3583,6 +3597,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
+ 0,
3
],
"AddEffect": false,
@@ -3894,7 +3909,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -3925,7 +3940,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 2
+ 2,
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -4040,7 +4056,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -4071,7 +4087,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -4133,7 +4149,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 0
],
"AddEffect": false,
"RemoveType": false,
@@ -4192,7 +4208,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4223,7 +4239,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4254,7 +4270,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4285,7 +4301,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4316,7 +4332,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4347,7 +4363,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4378,7 +4394,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4409,7 +4425,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4440,7 +4456,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4471,7 +4487,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4502,7 +4518,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4533,7 +4549,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4564,7 +4580,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4595,7 +4611,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4626,7 +4642,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4657,7 +4673,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4688,7 +4704,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4718,7 +4734,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4749,7 +4765,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4780,7 +4796,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4811,7 +4827,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4842,7 +4858,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4873,7 +4889,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4904,7 +4920,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4935,7 +4951,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4966,7 +4982,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -4997,7 +5013,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5028,7 +5044,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5059,7 +5075,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5090,7 +5106,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5121,7 +5137,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5153,7 +5169,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3,
+ 8,
7
],
"AddEffect": false,
@@ -5186,7 +5202,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3,
+ 8,
7
],
"AddEffect": false,
@@ -5218,7 +5234,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5249,7 +5265,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5280,7 +5296,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5311,7 +5327,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5342,7 +5358,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 3
+ 8
],
"AddEffect": false,
"RemoveType": false,
@@ -5372,7 +5388,7 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
- 1,
+ 8,
2
],
"AddEffect": false,
diff --git a/bin/json/game_uigameconsum.json b/bin/json/game_uigameconsum.json
new file mode 100644
index 000000000..624eed8e8
--- /dev/null
+++ b/bin/json/game_uigameconsum.json
@@ -0,0 +1,32 @@
+[
+ {
+ "gameid": 1,
+ "usepawer": 30,
+ "itemget": {
+ "a": "item",
+ "t": "23000002",
+ "n": 1
+ },
+ "getmax": 3
+ },
+ {
+ "gameid": 2,
+ "usepawer": 10,
+ "itemget": {
+ "a": "item",
+ "t": "23000003",
+ "n": 1
+ },
+ "getmax": 15
+ },
+ {
+ "gameid": 3,
+ "usepawer": 20,
+ "itemget": {
+ "a": "item",
+ "t": "23000004",
+ "n": 1
+ },
+ "getmax": 6
+ }
+]
\ No newline at end of file
diff --git a/modules/activity/api_gethddata.go b/modules/activity/api_gethddata.go
index 2bcdd07c5..bf5a96e04 100644
--- a/modules/activity/api_gethddata.go
+++ b/modules/activity/api_gethddata.go
@@ -63,7 +63,7 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
update := make(map[string]interface{})
// 计算进度
update["lasttime"] = list.Lasttime
- update["val"] = list.Val
+
update["gotarr"] = list.Gotarr
_days := this.module.configure.GetHDCelebrationData()
@@ -74,6 +74,7 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
pos++
if _sub == pos {
list.Val = int32(index) + 1 // 计算val 值
+ update["val"] = list.Val
break
}
}
diff --git a/modules/activity/model_hdlist.go b/modules/activity/model_hdlist.go
index e145631d4..b6fc117a9 100644
--- a/modules/activity/model_hdlist.go
+++ b/modules/activity/model_hdlist.go
@@ -36,6 +36,7 @@ func (this *modelHdList) Init(service core.IService, module core.IModule, comp c
func (this *modelHdList) getHdInfo() (activity map[pb.HdType]*pb.DBHuodong) {
+ this.LoadActivityData() // 临时处理 活动数据完善 删除
return this.activity
}
diff --git a/modules/activity/module.go b/modules/activity/module.go
index dbb07f540..42b1faf9a 100644
--- a/modules/activity/module.go
+++ b/modules/activity/module.go
@@ -225,7 +225,7 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
bChange := false
// 查询玩家活动记录
//key := fmt.Sprintf("%s-%s", session.GetUserId(), v.Id)
- if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), activity.Id); err != nil {
+ if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), activity.Id); err == nil {
// 注意 Gotarr:map[int32]int32 key value 已经挑战的次数
if !utils.IsToday(data.Lasttime) { // 不是今天重置
data.Lasttime = configure.Now().Unix()
@@ -237,11 +237,26 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
update["gotarr"] = data.Gotarr
bChange = true
}
-
- if conf, err := this.configure.GetHDCelebration(data.Val); err != nil {
+ if data.Val == 0 {
+ var pos int32
+ _sub := int32((configure.Now().Unix()-activity.Stime)/(24*3600)) + 1
+ _days := this.configure.GetHDCelebrationData()
+ for index, v := range _days {
+ for i := 0; i < int(v); i++ {
+ pos++
+ if _sub == pos {
+ data.Val = int32(index) + 1 // 计算val 值
+ update["val"] = data.Val
+ break
+ }
+ }
+ }
+ data.Val = 1
+ }
+ if conf, err := this.configure.GetHDCelebration(data.Val); err == nil {
if conf.Systemtype == systemtype {
- data.Gotarr[bosstype] += 1
+ data.Gotarr[systemtype] += 1
// 天数
var idays int32
for i, v1 := range conf.Bosstype {
@@ -253,17 +268,19 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
// 更新信息
update["gotarr"] = data.Gotarr
bChange = true
- if data.Gotarr[bosstype] <= idays {
+ if data.Gotarr[systemtype] <= idays {
bDouble = true
}
}
}
if bChange {
+ var sz []*pb.DBActivityData
this.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
// 推送活动数据进度变化
- session.SendMsg(string(this.GetType()), "change", &pb.ActivityDataChangePush{
- Data: []*pb.DBActivityData{data},
+ sz = append(sz, data)
+ session.SendMsg(string(this.GetType()), "datachange", &pb.ActivityDataChangePush{
+ Data: sz,
})
}
}
diff --git a/modules/uigame/api_getlist.go b/modules/uigame/api_getlist.go
index 520d93ec6..5cfe4fa8b 100644
--- a/modules/uigame/api_getlist.go
+++ b/modules/uigame/api_getlist.go
@@ -3,6 +3,7 @@ package uigame
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
)
//参数校验
@@ -15,6 +16,45 @@ func (this *apiComp) GetPuzzle(session comm.IUserSession, req *pb.UiGameGetPuzzl
if errdata = this.GetPuzzleCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
+ var (
+ activity *pb.DBHuodong
+ err error
+ hdData *pb.DBPuzzleData // 玩家的活动数据
+ update map[string]interface{} //
+ )
+ curTime := configure.Now().Unix()
+ if activity, err = this.module.ModuleActivity.GetHdInfoByHdId(req.Hdid); err != nil { // 活动不存在
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ActivityInvalid,
+ Title: pb.ErrorCode_ActivityInvalid.ToString(),
+ }
+ return
+ }
+ if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ActivityNotIntime,
+ Title: pb.ErrorCode_ActivityNotIntime.ToString(),
+ }
+ return
+ }
+
+ // 获取玩家活动数据
+ hdData, _ = this.module.modelPuzzle.getPuzzleList(session.GetUserId(), activity.Id)
+ if e, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
+
+ if conf, err := this.module.configure.GetPuzzleConsumConf(); err != nil {
+ if conf.Getmax > hdData.Val { // 超过今日上限
+ if e.ConsumPs/conf.Usepawer >= hdData.Val {
+ hdData.Val = e.ConsumPs / conf.Usepawer
+ if conf.Getmax < hdData.Val { // 超过今日上限
+ hdData.Val = conf.Getmax
+ update["val"] = hdData.Val
+ this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度
+ }
+ }
+ }
+ }
+ }
list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid)
diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go
index be7e79dad..1ef68ca36 100644
--- a/modules/uigame/api_puzzlegrid.go
+++ b/modules/uigame/api_puzzlegrid.go
@@ -3,6 +3,7 @@ package uigame
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@@ -16,9 +17,33 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG
if errdata = this.PuzzleGridCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
-
+ var (
+ consum *cfg.Gameatn // 获取消耗
+ )
list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid)
+ if _, ok := list.Gotarr[req.Grid]; ok { // 重复拼图
+ return
+ }
+ // 校验消耗
+ if conf, err := this.module.configure.GetPuzzleConsumConf(); err != nil {
+ consum = &cfg.Gameatn{
+ A: conf.Itemget.A,
+ T: conf.Itemget.T,
+ N: 1,
+ }
+ }
+ if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consum}, true); errdata != nil {
+ return
+ }
+ // list.Val -= 1
+ // if list.Val < 0 { // 拼图数量不足
+ // return
+ // }
+ list.Gotarr[req.Grid] = 1
+ update := make(map[string]interface{}, 0)
+ update["gotarr"] = list.Gotarr
+ this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度
session.SendMsg(string(this.module.GetType()), "puzzlegrid", &pb.UiGamePuzzleGridResp{Data: list})
return
}
diff --git a/modules/uigame/comp_configure.go b/modules/uigame/comp_configure.go
index ed3a4bd89..350af1c97 100644
--- a/modules/uigame/comp_configure.go
+++ b/modules/uigame/comp_configure.go
@@ -13,6 +13,7 @@ var moduleName = "viking"
const (
game_puzzle = "game_uigamepuzzle.json"
+ game_consum = "game_uigameconsum.json"
)
///配置管理基础组件
@@ -28,6 +29,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.module = module.(*UiGame)
err = this.LoadMultiConfigure(map[string]interface{}{
game_puzzle: cfg.NewGameUiGamePuzzle,
+ game_consum: cfg.NewGameUiGameConsum,
})
return
@@ -63,3 +65,19 @@ func (this *configureComp) GetPuzzleConf(id int32) (conf *cfg.GameUiGamePuzzleDa
this.module.Errorf("GetPuzzleConf conf not found key :%d", id)
return
}
+
+// 获取拼图体力消耗
+func (this *configureComp) GetPuzzleConsumConf() (conf *cfg.GameUiGameConsumData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_consum); err == nil {
+ if configure, ok := v.(*cfg.GameUiGameConsum); ok {
+ if conf = configure.Get(1); conf != nil {
+ return
+ }
+ }
+ }
+ this.module.Errorf("GetPuzzleConf conf not found key :puzzle")
+ return
+}
diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go
index ae8b2ab47..0d4d7220d 100644
--- a/pb/uigame_msg.pb.go
+++ b/pb/uigame_msg.pb.go
@@ -121,8 +121,8 @@ type UiGamePuzzleGridReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
- PuzzleId int32 `protobuf:"varint,2,opt,name=puzzleId,proto3" json:"puzzleId"` // 格子ID
+ Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
+ Grid int32 `protobuf:"varint,2,opt,name=grid,proto3" json:"grid"` // 格子ID
}
func (x *UiGamePuzzleGridReq) Reset() {
@@ -164,9 +164,9 @@ func (x *UiGamePuzzleGridReq) GetHdid() string {
return ""
}
-func (x *UiGamePuzzleGridReq) GetPuzzleId() int32 {
+func (x *UiGamePuzzleGridReq) GetGrid() int32 {
if x != nil {
- return x.PuzzleId
+ return x.Grid
}
return 0
}
@@ -351,28 +351,27 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{
0x65, 0x47, 0x65, 0x74, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21,
0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x22, 0x45, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c,
+ 0x61, 0x22, 0x3d, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c,
0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
- 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
- 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x58, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61,
- 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
- 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74,
- 0x6e, 0x6f, 0x22, 0x47, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a,
- 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68,
- 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12,
- 0x1a, 0x0a, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x16, 0x55,
- 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72,
- 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61,
- 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f,
- 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
- 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+ 0x67, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x72, 0x69, 0x64,
+ 0x22, 0x58, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
+ 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c,
+ 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61,
+ 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
+ 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x47, 0x0a, 0x15, 0x55, 0x69,
+ 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+ 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
+ 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
+ 0x65, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x16, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a,
+ 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+ 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+ 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.BuffEffectType.go b/sys/configure/structs/Game.BuffEffectType.go
index b4a4859e3..6381b56f4 100644
--- a/sys/configure/structs/Game.BuffEffectType.go
+++ b/sys/configure/structs/Game.BuffEffectType.go
@@ -17,4 +17,5 @@ const (
GameBuffEffectType_Chosen = 5
GameBuffEffectType_DebuffWithoutControl = 6
GameBuffEffectType_Shield = 7
+ GameBuffEffectType_Overall = 8
)
diff --git a/sys/configure/structs/Game.PassCheckData.go b/sys/configure/structs/Game.PassCheckData.go
index f681173bd..b2cacc88c 100644
--- a/sys/configure/structs/Game.PassCheckData.go
+++ b/sys/configure/structs/Game.PassCheckData.go
@@ -18,6 +18,8 @@ type GamePassCheckData struct {
FreeReward *Gameatn
PayReward *Gameatn
PayId string
+ PayproId string
+ PaymidId string
}
const TypeId_GamePassCheckData = -880679227
@@ -34,6 +36,8 @@ func (_v *GamePassCheckData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["free_reward"].(map[string]interface{}); !_ok_ { err = errors.New("free_reward error"); return }; if _v.FreeReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["pay_reward"].(map[string]interface{}); !_ok_ { err = errors.New("pay_reward error"); return }; if _v.PayReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; if _v.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } }
+ { var _ok_ bool; if _v.PayproId, _ok_ = _buf["paypro_id"].(string); !_ok_ { err = errors.New("paypro_id error"); return } }
+ { var _ok_ bool; if _v.PaymidId, _ok_ = _buf["paymid_id"].(string); !_ok_ { err = errors.New("paymid_id error"); return } }
return
}
diff --git a/sys/configure/structs/Game.UiGameConsum.go b/sys/configure/structs/Game.UiGameConsum.go
new file mode 100644
index 000000000..01dca2828
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameConsum.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameUiGameConsum struct {
+ _dataMap map[int32]*GameUiGameConsumData
+ _dataList []*GameUiGameConsumData
+}
+
+func NewGameUiGameConsum(_buf []map[string]interface{}) (*GameUiGameConsum, error) {
+ _dataList := make([]*GameUiGameConsumData, 0, len(_buf))
+ dataMap := make(map[int32]*GameUiGameConsumData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameUiGameConsumData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Gameid] = _v
+ }
+ }
+ return &GameUiGameConsum{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameUiGameConsum) GetDataMap() map[int32]*GameUiGameConsumData {
+ return table._dataMap
+}
+
+func (table *GameUiGameConsum) GetDataList() []*GameUiGameConsumData {
+ return table._dataList
+}
+
+func (table *GameUiGameConsum) Get(key int32) *GameUiGameConsumData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.UiGameConsumData.go b/sys/configure/structs/Game.UiGameConsumData.go
new file mode 100644
index 000000000..460b29cc3
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameConsumData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameUiGameConsumData struct {
+ Gameid int32
+ Usepawer int32
+ Itemget *Gameatn
+ Getmax int32
+}
+
+const TypeId_GameUiGameConsumData = 380347541
+
+func (*GameUiGameConsumData) GetTypeId() int32 {
+ return 380347541
+}
+
+func (_v *GameUiGameConsumData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gameid"].(float64); !_ok_ { err = errors.New("gameid error"); return }; _v.Gameid = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["usepawer"].(float64); !_ok_ { err = errors.New("usepawer error"); return }; _v.Usepawer = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["itemget"].(map[string]interface{}); !_ok_ { err = errors.New("itemget error"); return }; if _v.Itemget, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["getmax"].(float64); !_ok_ { err = errors.New("getmax error"); return }; _v.Getmax = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameUiGameConsumData(_buf map[string]interface{}) (*GameUiGameConsumData, error) {
+ v := &GameUiGameConsumData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index c55d0fe83..c4e7abe68 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -240,6 +240,7 @@ type Tables struct {
UiGameLattice *GameUiGameLattice
UiGameMiner *GameUiGameMiner
PushGift *GamePushGift
+ UiGameConsum *GameUiGameConsum
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1621,5 +1622,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PushGift, err = NewGamePushGift(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_uigameconsum") ; err != nil {
+ return nil, err
+ }
+ if tables.UiGameConsum, err = NewGameUiGameConsum(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 24dc6a735..477953a3b 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -256,6 +256,11 @@ type GameGlobalData struct {
VenturegiftsDraw string
GiftBuy int32
Herostorycd int32
+ Passcheck4GetLvCos *Gameatn
+ PasscheckPro4UpLv int32
+ Passcheck4WeekMaxExp int32
+ Passcheck4DayNum int32
+ Passcheck4WeekNum int32
}
const TypeId_GameGlobalData = 477542761
@@ -1069,6 +1074,11 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.VenturegiftsDraw, _ok_ = _buf["venturegifts_draw"].(string); !_ok_ { err = errors.New("venturegifts_draw error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gift_buy"].(float64); !_ok_ { err = errors.New("gift_buy error"); return }; _v.GiftBuy = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herostorycd"].(float64); !_ok_ { err = errors.New("herostorycd error"); return }; _v.Herostorycd = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["Passcheck4_GetLvCos"].(map[string]interface{}); !_ok_ { err = errors.New("Passcheck4_GetLvCos error"); return }; if _v.Passcheck4GetLvCos, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasscheckPro4_UpLv"].(float64); !_ok_ { err = errors.New("PasscheckPro4_UpLv error"); return }; _v.PasscheckPro4UpLv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Passcheck4_WeekMaxExp"].(float64); !_ok_ { err = errors.New("Passcheck4_WeekMaxExp error"); return }; _v.Passcheck4WeekMaxExp = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Passcheck4_DayNum"].(float64); !_ok_ { err = errors.New("Passcheck4_DayNum error"); return }; _v.Passcheck4DayNum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Passcheck4_WeekNum"].(float64); !_ok_ { err = errors.New("Passcheck4_WeekNum error"); return }; _v.Passcheck4WeekNum = int32(_tempNum_) }
return
}