diff --git a/Assets/Content/Config/LanguagePackage_cn.csv b/Assets/Content/Config/LanguagePackage_cn.csv
index baa6000f6..104aaf7e0 100644
--- a/Assets/Content/Config/LanguagePackage_cn.csv
+++ b/Assets/Content/Config/LanguagePackage_cn.csv
@@ -1841,13 +1841,13 @@ BoLiNote11,【属性加点】请选择角色
BoLiNote12,【属性加点】请点击属性
BoLiNote13,【属性加点】来吧!把暴击拉满!
BoLiNote14,【属性加点】记得保存加点!
-BoLiNote15,【编辑队伍】\n有新队友了,把他加入队伍!
-BoLiNote16,【编辑队伍】邀请队友
-BoLiNote17,【升级队友】队友已进入队列,现在去升级队友吧
-BoLiNote18,【升级队友】反复点升级!点!点!点!
-BoLiNote19,【编辑队伍】保存编辑队伍配置
-BoLiNote20,点击打开背包
-BoLiNote21,找到卡片页签
+BoLiNote15,【撩一撩】去撩一个妹子吧!
+BoLiNote16,【撩一撩】点击发现
+BoLiNote17,【撩一撩】\n点击开始撩吧!
+BoLiNote18,【编辑队伍】邀请队友
+BoLiNote19,【升级队友】队友已进入队列,现在去升级队友吧
+BoLiNote20,【升级队友】反复点升级!点!点!点!
+BoLiNote21,【编辑队伍】保存编辑队伍配置
BoLiNote22,请选择一张卡片
BoLiNote23,点击插卡按钮
BoLiNote24,选择要插入的装备
diff --git a/Assets/Lua/Config/ForceGuideCfg.lua b/Assets/Lua/Config/ForceGuideCfg.lua
index ff320c96e..0c1798522 100644
--- a/Assets/Lua/Config/ForceGuideCfg.lua
+++ b/Assets/Lua/Config/ForceGuideCfg.lua
@@ -228,17 +228,17 @@ local ForceGuideCfg = {
['LogicLua']='',
['LuaParam']='',
},
--- 第6个强制引导:编辑队伍
+--第6个强制引导:MOMO引导
[15]={
['Id']=15,
['Group']=6,
['Type']=0,
['UIId']=2,
-['Path']='role.icon',
+['Path']='feiGeBtn.icon',
['MaskCloseDelayTime']=500,
['MaskCloseTime']=500,
['MaskOpenTime']=0,
-['BoLiPos']={-223,137},
+['BoLiPos']={-359,168},
['BoLiNote']='BoLiNote15',
['ExpandSize']={100,100},
['CenterOffset']={0,0},
@@ -249,12 +249,12 @@ local ForceGuideCfg = {
['Id']=16,
['Group']=6,
['Type']=0,
-['UIId']=3004,
-['Path']='hero2.roleLua.gameObject',
+['UIId']=142,
+['Path']='searchTabBtn',
['MaskCloseDelayTime']=500,
['MaskCloseTime']=500,
['MaskOpenTime']=0,
-['BoLiPos']={-171,274},
+['BoLiPos']={-197,170},
['BoLiNote']='BoLiNote16',
['ExpandSize']={100,100},
['CenterOffset']={0,0},
@@ -265,21 +265,70 @@ local ForceGuideCfg = {
['Id']=17,
['Group']=6,
['Type']=0,
-['UIId']=3004,
-['Path']='hero2.roleLua.gameObject',
+['UIId']=142,
+['Path']='searchTabGreetBtn1',
['MaskCloseDelayTime']=500,
['MaskCloseTime']=500,
['MaskOpenTime']=0,
-['BoLiPos']={-171,274},
+['BoLiPos']={-108,120},
['BoLiNote']='BoLiNote17',
['ExpandSize']={100,100},
['CenterOffset']={0,0},
['LogicLua']='',
['LuaParam']='',
},
+-- 第7个强制引导:编辑队伍
[18]={
['Id']=18,
-['Group']=6,
+['Group']=7,
+['Type']=0,
+['UIId']=2,
+['Path']='role.icon',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={-223,137},
+['BoLiNote']='BoLiNote18',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+[19]={
+['Id']=19,
+['Group']=7,
+['Type']=0,
+['UIId']=3004,
+['Path']='hero2.roleLua.gameObject',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={-171,274},
+['BoLiNote']='BoLiNote19',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+[20]={
+['Id']=20,
+['Group']=7,
+['Type']=0,
+['UIId']=3004,
+['Path']='hero2.roleLua.gameObject',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={-171,274},
+['BoLiNote']='BoLiNote20',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+[21]={
+['Id']=21,
+['Group']=7,
['Type']=0,
['UIId']=3005,
['Path']='btnLvUp',
@@ -287,7 +336,7 @@ local ForceGuideCfg = {
['MaskCloseTime']=500,
['MaskOpenTime']=0,
['BoLiPos']={-554,-190},
-['BoLiNote']='BoLiNote18',
+['BoLiNote']='BoLiNote21',
['ExpandSize']={100,100},
['CenterOffset']={0,0},
['LogicLua']='',
diff --git a/Assets/Lua/Config/LevelCfg1.lua b/Assets/Lua/Config/LevelCfg1.lua
index 0c7d3499e..de82a2ccd 100644
--- a/Assets/Lua/Config/LevelCfg1.lua
+++ b/Assets/Lua/Config/LevelCfg1.lua
@@ -569,7 +569,7 @@ local LevelCfg1 = {
['DlgId']=60,
['DlgContentId']=0,
['StorySection']=0,
-['ForceGuideGroup']=0,
+['ForceGuideGroup']=6,
['LevelPointType']=1,
['LevelPointCoordinate']={148,-401},
['BossKey']='',
@@ -605,7 +605,7 @@ local LevelCfg1 = {
['DlgId']=0,
['DlgContentId']=0,
['StorySection']=2001017,
-['ForceGuideGroup']=0,
+['ForceGuideGroup']=7,
['LevelPointType']=1,
['LevelPointCoordinate']={53,-553},
['BossKey']='',
diff --git a/Assets/Lua/Config/StoryRewardCfg.lua b/Assets/Lua/Config/StoryRewardCfg.lua
index 297f1895d..59e32646e 100644
--- a/Assets/Lua/Config/StoryRewardCfg.lua
+++ b/Assets/Lua/Config/StoryRewardCfg.lua
@@ -642,30 +642,142 @@ local StoryRewardCfg = {
[6001]={
['Id']=6001,
['StoryId']=60,
-['MapLevel']=10026,
+['MapLevel']=10016,
['RewardType']=1,
-['HeartReward']='104:2',
+['HeartReward']='201:12',
},
[6002]={
['Id']=6002,
['StoryId']=60,
-['MapLevel']=10026,
+['MapLevel']=10016,
['RewardType']=2,
-['GiftReward']={{681,6}},
+['GiftReward']={{1002,1},{5002,1},{6002,1},{7002,1},{8002,1},{9002,1}},
},
[8001]={
['Id']=8001,
['StoryId']=80,
-['MapLevel']=20006,
+['MapLevel']=10022,
['RewardType']=1,
-['HeartReward']='104:10',
+['HeartReward']='202:10',
},
-[6002]={
-['Id']=6002,
+[8002]={
+['Id']=8002,
['StoryId']=80,
-['MapLevel']=20006,
+['MapLevel']=10022,
['RewardType']=2,
['GiftReward']={{681,6}},
},
+[10001]={
+['Id']=10001,
+['StoryId']=100,
+['MapLevel']=10028,
+['RewardType']=1,
+['HeartReward']='201:5',
+},
+[10002]={
+['Id']=10002,
+['StoryId']=100,
+['MapLevel']=10028,
+['RewardType']=2,
+['GiftReward']={{682,3}},
+},
+[12001]={
+['Id']=12001,
+['StoryId']=120,
+['MapLevel']=20006,
+['RewardType']=1,
+['HeartReward']='203:10',
+},
+[12002]={
+['Id']=12002,
+['StoryId']=120,
+['MapLevel']=20006,
+['RewardType']=2,
+['GiftReward']={{681,4}},
+},
+[14001]={
+['Id']=14001,
+['StoryId']=140,
+['MapLevel']=20016,
+['RewardType']=1,
+['HeartReward']='202:6',
+},
+[14002]={
+['Id']=14002,
+['StoryId']=140,
+['MapLevel']=20016,
+['RewardType']=2,
+['GiftReward']={{681,4}},
+},
+[16001]={
+['Id']=16001,
+['StoryId']=160,
+['MapLevel']=20026,
+['RewardType']=1,
+['HeartReward']='201:5',
+},
+[16002]={
+['Id']=16002,
+['StoryId']=160,
+['MapLevel']=20026,
+['RewardType']=2,
+['GiftReward']={{682,5}},
+},
+[18001]={
+['Id']=18001,
+['StoryId']=180,
+['MapLevel']=30006,
+['RewardType']=1,
+['HeartReward']='202:5',
+},
+[18002]={
+['Id']=18002,
+['StoryId']=180,
+['MapLevel']=30006,
+['RewardType']=2,
+['GiftReward']={{681,4}},
+},
+[20001]={
+['Id']=20001,
+['StoryId']=200,
+['MapLevel']=30016,
+['RewardType']=1,
+['HeartReward']='203:8',
+},
+[20002]={
+['Id']=20002,
+['StoryId']=200,
+['MapLevel']=30016,
+['RewardType']=2,
+['GiftReward']={{681,4}},
+},
+[22001]={
+['Id']=22001,
+['StoryId']=220,
+['MapLevel']=30026,
+['RewardType']=1,
+['HeartReward']='203:8',
+},
+[22002]={
+['Id']=22002,
+['StoryId']=220,
+['MapLevel']=30026,
+['RewardType']=2,
+['GiftReward']={{681,4}},
+},
+[24001]={
+['Id']=24001,
+['StoryId']=240,
+['MapLevel']=30036,
+['RewardType']=1,
+['HeartReward']='201:5',
+},
+[24002]={
+['Id']=24002,
+['StoryId']=240,
+['MapLevel']=30036,
+['RewardType']=2,
+['GiftReward']={{682,5}},
+},
}
return StoryRewardCfg
\ No newline at end of file