diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json
index 49e13bf6b..faf0ec808 100644
--- a/bin/json/game_chatsystem.json
+++ b/bin/json/game_chatsystem.json
@@ -176,7 +176,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_11",
- "text": "【传闻】{0}已经{1}培养至60级！"
+ "text": "【传闻】{0}已经将{1}培养至60级！"
},
"data": 60,
"data2": 0,
@@ -191,7 +191,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_12",
- "text": "【传闻】{0}已经{1}培养至6星！"
+ "text": "【传闻】{0}已经将{1}培养至6星！"
},
"data": 5,
"data2": 0,
@@ -206,7 +206,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_13",
- "text": "【传闻】{0}已经{1}技能培养至满级！"
+ "text": "【传闻】{0}已经将{1}技能培养至满级！"
},
"data": 5,
"data2": 0,
@@ -221,7 +221,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_14",
- "text": "【传闻】{0}已经{1}回响至满级！"
+ "text": "【传闻】{0}已经将{1}回响至满级！"
},
"data": 5,
"data2": 0,
@@ -236,7 +236,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_15",
- "text": "【传闻】{0}已经{1}觉醒至满级！"
+ "text": "【传闻】{0}已经将{1}觉醒至满级！"
},
"data": 5,
"data2": 0,
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 345818184..8729d3690 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -220,48 +220,7 @@
"t": "18000004",
"n": 1
},
- "Arena_buy": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 200
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 400
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 600
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 800
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 1000
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 1200
- },
- {
- "a": "attr",
- "t": "diamond",
- "n": 1400
- }
- ],
+ "Arena_buy": 1001,
"VikingExpedition_RecoveryTime": 144,
"cops_RecoveryTime": 300,
"cops_InitialNum": 60,
diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json
index b59459a16..c34c64354 100644
--- a/bin/json/game_playerlv.json
+++ b/bin/json/game_playerlv.json
@@ -19,7 +19,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -38,7 +38,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -57,7 +57,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -76,7 +76,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -95,7 +95,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -114,7 +114,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -133,7 +133,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -152,7 +152,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -171,7 +171,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -190,7 +190,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -209,7 +209,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -228,7 +228,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -247,7 +247,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -266,7 +266,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -285,7 +285,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -304,7 +304,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -323,7 +323,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -342,7 +342,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -361,7 +361,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -380,7 +380,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -399,7 +399,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -418,7 +418,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -437,7 +437,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -456,7 +456,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -475,7 +475,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -494,7 +494,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -513,7 +513,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -532,7 +532,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -551,7 +551,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -570,7 +570,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -589,7 +589,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -608,7 +608,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -627,7 +627,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -646,7 +646,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -665,7 +665,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -684,7 +684,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -703,7 +703,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -722,7 +722,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -741,7 +741,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -760,7 +760,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -779,7 +779,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -798,7 +798,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -817,7 +817,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -836,7 +836,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -855,7 +855,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -874,7 +874,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -893,7 +893,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -912,7 +912,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -931,7 +931,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -950,7 +950,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -969,7 +969,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -988,7 +988,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1007,7 +1007,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1026,7 +1026,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1045,7 +1045,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1064,7 +1064,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1083,7 +1083,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1102,7 +1102,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
@@ -1121,7 +1121,7 @@
{
"a": "attr",
"t": "starcoin",
- "n": 40
+ "n": 400
}
],
"ps_ceiling": 180,
diff --git a/bin/json/game_pricegroup.json b/bin/json/game_pricegroup.json
index be421e355..74b29a9f4 100644
--- a/bin/json/game_pricegroup.json
+++ b/bin/json/game_pricegroup.json
@@ -89,5 +89,18 @@
"n": 250
}
]
+ },
+ {
+ "id": 8,
+ "pricegroupId": 1001,
+ "purchasemin": 11,
+ "purchasemax": -1,
+ "cost": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 250
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 2190af6bb..f23f957cb 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -29,18 +29,18 @@
},
"content": {
"key": "ruledesc_ruledesc_content_3",
- "text": "这里可以查看与各个守护者们的好感度。"
+ "text": "这里可以查看与各个守护者们的好感度。
点击守护者可以进入守护者送礼界面。"
}
},
{
"id": 10004,
"title": {
"key": "ruledesc_ruledesc_title_4",
- "text": "好感度详细说明"
+ "text": "好感度说明"
},
"content": {
"key": "ruledesc_ruledesc_content_4",
- "text": "这里可以给守护者送礼，提升与守护者的好感度。"
+ "text": "这里可以给守护者送礼，提升与守护者的好感度。
每个守护者每日最多送礼9次，且每次赠送会随着饱腹度的增加而减少好感度的增加。
每日赠送1-3次，为100%的食物好感度。
每日赠送4-6次，为80%的食物好感度。
每日赠送7-9次，为50%的好感度。
每个守护者有喜欢的食物与讨厌的食物，赠送喜欢的食物增加的好感度为1.5倍，且对话也有所不同。"
}
},
{
@@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
- "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励，完成一定数量的陪练还有格外奖励。"
+ "text": "这里可以查看各种功夫陪练，完成陪练可以获得高额奖励。
完成3/6/9次的陪练还有格外奖励可以领取。"
}
},
{
@@ -84,7 +84,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_8",
- "text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战卷。
挑战玩家也需消耗竞技场挑战卷，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。"
+ "text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战卷。
竞技场挑战卷随时间恢复，每144分钟回复一张。
可以使用钻石直接购买竞技场挑战卷。购买上限最多为8张。每次购买消耗的钻石逐级递增。
挑战玩家也需消耗竞技场挑战卷，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。
积分排名逻辑：
黑铁：0—799，竞技胜利获胜奖励为竞技币10个。
青铜：800-1299，竞技胜利获胜奖励为竞技币12个。
白银：1300-1599，竞技胜利获胜奖励为竞技币14个。
黄金：1600-2199，竞技胜利获胜奖励为竞技币16个。
铂金：2200-2799，竞技胜利获胜奖励为竞技币18个。
钻石:2800-3699,竞技胜利获胜奖励为竞技币20个。
大师：3700-4599，竞技胜利获胜奖励为竞技币22个。
王者：4600以上，竞技胜利获胜奖励为竞技币22个。
积分排名奖励具体查看排名中的奖励预览。"
}
},
{
@@ -161,7 +161,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_15",
- "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以再狩猎与宝箱中获得。"
+ "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级，6星60级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星。荣耀徽章可以通过合成或分解操作，进行不同星级之间的转换。
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。技能等级提升为随机提升该守护者未满级的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以再狩猎与宝箱中获得。"
}
},
{
@@ -172,7 +172,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_16",
- "text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一件穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。"
+ "text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一件穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。
点击装备可以打开装备强化界面，"
}
},
{
@@ -205,7 +205,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_19",
- "text": "这里可以挑战泰坦们获得打造材料。"
+ "text": "这里可以挑战泰坦们获得打造材料。
泰坦共有三种，挑战不同的泰坦都会有不同类别的装备打造材料。
挑战高难度泰坦获得的材料奖励越多。"
}
},
{
@@ -216,7 +216,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_20",
- "text": "这里可以狩猎各种敌人获得珍惜材料。"
+ "text": "这里可以狩猎各种敌人获得回响材料。
狩猎挑战随时间开放不同的狩猎头目，掉落的回响材料可用于阵容也会有所不同。
挑战难度越高的狩猎头目，获得的材料数量与稀有度越高。"
}
},
{
@@ -260,7 +260,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_24",
- "text": "这里可以查看关卡星完成条件与获胜可获得奖励。"
+ "text": "这里可以查看关卡星完成条件，积累一定的关卡星可以获得格外的道具奖励。"
}
},
{
@@ -326,7 +326,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_30",
- "text": "这里可以使用装备手册的各个技能强化锻造炉。
技能包括：
销售精英：
可以提升装备的售价。
节能环保：
可以减少打造所消耗的炉温。
推广引流：
可以提升顾客数量。
倾销货物：
可以提升顾客购买装备数量的上限。
制作大师：
打造高品质装备时满星的概率提升1%。
每当前一个技能提升至5级时解锁下一个技能强化选项。"
+ "text": "这里可以使用装备手册的各个技能强化锻造炉。
技能包括：
销售精英：
可以提升装备的售价。
节能环保：
可以减少打造所消耗的炉温。
推广引流：
可以提升顾客数量。
倾销货物：
可以提升顾客购买装备数量的上限。
制作大师：
打造高品质装备时满星的概率提升1%。"
}
},
{
@@ -337,7 +337,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_31",
- "text": "这里可以挑战功夫塔，每次挑战胜利都可以获得奖励，每挑战胜利10层会有特殊奖励（功夫塔挑战不需要消耗物品）。"
+ "text": "这里可以挑战功夫塔，每次挑战胜利都可以获得奖励，每挑战胜利10层可以获得相应教习。（功夫塔挑战不需要消耗物品）。"
}
},
{
@@ -458,7 +458,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_42",
- "text": "这里可以可以使用星图币强化这个属性的全部守护者们。"
+ "text": "这里可以可以使用星图币强化某个属性的全部守护者们。
强化属性会在战斗中生效，不会在属性中显示。
星图币在玩家升级时获得。"
}
},
{
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 1334e4f9c..c6525b5fb 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -218,43 +218,5 @@
15008,
15009
]
- },
- {
- "shopid": 7,
- "tab": 7,
- "shopname": {
- "key": "shop_shop_shopname_7",
- "text": "铁匠商店"
- },
- "upper_shop": {
- "key": "shop_shop_upper_shop_7",
- "text": "玩法商店"
- },
- "needshow": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 1
- }
- ],
- "rtype": 2,
- "rtime": 7,
- "rnum": -1,
- "rneed": [],
- "shopitem": [
- 16001,
- 16002,
- 16003,
- 16004,
- 16005,
- 16006,
- 16007,
- 16008,
- 16009,
- 16010,
- 16011,
- 16012,
- 16013
- ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index 6bdf7fc0f..4a34010b6 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -71,474 +71,6 @@
"mapidmin": 101,
"mapidmax": 9999
},
- {
- "key": 6,
- "id": 16001,
- "iteminfo": [
- {
- "a": "item",
- "t": "13001001",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 7,
- "id": 16002,
- "iteminfo": [
- {
- "a": "item",
- "t": "13001002",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 8,
- "id": 16003,
- "iteminfo": [
- {
- "a": "item",
- "t": "13001003",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 9,
- "id": 16004,
- "iteminfo": [
- {
- "a": "item",
- "t": "13002001",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 10,
- "id": 16005,
- "iteminfo": [
- {
- "a": "item",
- "t": "13002002",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 11,
- "id": 16006,
- "iteminfo": [
- {
- "a": "item",
- "t": "13002003",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 12,
- "id": 16007,
- "iteminfo": [
- {
- "a": "item",
- "t": "13003001",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 13,
- "id": 16008,
- "iteminfo": [
- {
- "a": "item",
- "t": "13003002",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 14,
- "id": 16009,
- "iteminfo": [
- {
- "a": "item",
- "t": "13003003",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 15,
- "id": 16010,
- "iteminfo": [
- {
- "a": "item",
- "t": "13000001",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 16,
- "id": 16011,
- "iteminfo": [
- {
- "a": "item",
- "t": "13000002",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 17,
- "id": 16012,
- "iteminfo": [
- {
- "a": "item",
- "t": "13000003",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 18,
- "id": 16013,
- "iteminfo": [
- {
- "a": "item",
- "t": "13000004",
- "n": 100
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 999,
- "buymaxnum": 999,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
{
"key": 19,
"id": 10001,
diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go
index a4e010666..9d49b5ebc 100644
--- a/modules/equipment/api_washconfirm.go
+++ b/modules/equipment/api_washconfirm.go
@@ -1,13 +1,14 @@
package equipment
import (
+ "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
-//参数校验
+// 参数校验
func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) {
if req.Eid == "" || req.Pids == nil || len(req.Pids) == 0 {
errdata = &pb.ErrorData{
@@ -18,11 +19,13 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme
return
}
-//锻造
+// 锻造
func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
attrlibrary *cfg.GameEquipAttrlibrarySData
+ hero *pb.DBHero
+ equipments []*pb.DB_Equipment
err error
)
if errdata = this.WashConfirmCheck(session, req); errdata != nil {
@@ -74,6 +77,32 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
}
return
}
+ if equip.HeroId != "" {
+ equipments = make([]*pb.DB_Equipment, 8)
+ if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); errdata != nil {
+ return
+ }
+ for i, v := range hero.EquipID {
+ if v != "" {
+ if v != equip.Id {
+ if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_EquipmentOnFoundEquipment,
+ Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
+ Message: fmt.Sprintf("装备唯一 id:%s", v),
+ }
+ return
+ }
+ } else {
+ equipments[i] = equip
+ }
+ }
+ }
+ if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
+ return
+ }
+ }
+
session.SendMsg(string(this.module.GetType()), "washconfirm", &pb.EquipmentWashConfirmResp{Issucc: true})
return
}
diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go
index e67dbac39..396456717 100644
--- a/sys/configure/structs/Game.WorldBattleData.go
+++ b/sys/configure/structs/Game.WorldBattleData.go
@@ -16,6 +16,7 @@ type GameWorldBattleData struct {
BattleReadyID int32
EventList []int32
Playexp *Gameatn
+ Carexe int32
}
const TypeId_GameWorldBattleData = 1096332216
@@ -56,6 +57,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro
}
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 41008685c..f85e30f5f 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -114,7 +114,7 @@ type GameGlobalData struct {
ArenaTicketMax int32
ArenaTicketRecoveryTime int32
ArenaTicketCos *Gameatn
- ArenaBuy []*Gameatn
+ ArenaBuy int32
VikingExpeditionRecoveryTime int32
CopsRecoveryTime int32
CopsInitialNum int32
@@ -493,20 +493,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["Arena_buy"].([]interface{}); !_ok_ { err = errors.New("Arena_buy error"); return }
-
- _v.ArenaBuy = make([]*Gameatn, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ *Gameatn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
- _v.ArenaBuy = append(_v.ArenaBuy, _list_v_)
- }
- }
-
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Arena_buy"].(float64); !_ok_ { err = errors.New("Arena_buy error"); return }; _v.ArenaBuy = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_RecoveryTime"].(float64); !_ok_ { err = errors.New("cops_RecoveryTime error"); return }; _v.CopsRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_InitialNum"].(float64); !_ok_ { err = errors.New("cops_InitialNum error"); return }; _v.CopsInitialNum = int32(_tempNum_) }
diff --git a/sys/configure/structs/game.playerlvData.go b/sys/configure/structs/game.playerlvData.go
index f549665f9..d3e9ff867 100644
--- a/sys/configure/structs/game.playerlvData.go
+++ b/sys/configure/structs/game.playerlvData.go
@@ -16,6 +16,7 @@ type GamePlayerlvData struct {
Reward []*Gameatn
PsCeiling int32
CopsPsCeiling int32
+ HeroLv int32
}
const TypeId_GamePlayerlvData = 927774449
@@ -43,6 +44,7 @@ func (_v *GamePlayerlvData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_ceiling"].(float64); !_ok_ { err = errors.New("ps_ceiling error"); return }; _v.PsCeiling = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_ps_ceiling"].(float64); !_ok_ { err = errors.New("cops_ps_ceiling error"); return }; _v.CopsPsCeiling = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero_lv"].(float64); !_ok_ { err = errors.New("hero_lv error"); return }; _v.HeroLv = int32(_tempNum_) }
return
}