Merge branch 'game' of http://127.0.0.1:3000/fatiao/ro-webgl into game

Assets/Content/Config/GlobalCfg.csv

@@ -47,7 +47,7 @@ int,string,int,string,float
 44,男性初始模型,,Hero/Base_Man,
 45,女性初始模型,,Hero/Base_Women,
 46,战斗最少时间,1,,
-47,领取奖励最少时间,240,,
+47,领取奖励最少时间,60,,
 48,挂机累积时间上限,43200,,
 49,传送离开,10116,,
 50,传送进入,10116,,

Assets/Content/Config/LanguagePackage_cn.csv

@@ -1827,11 +1827,11 @@ UseLv,使用等级
 UseLvTips,主角等级不足{0}，无法使用{1}
 ChangeJobSkillShow,[{0}]技能
 BoLiNote0,请点击角色按钮
-BoLiNote1,请点击技能书按钮
+BoLiNote1,点击挑战BOSS
 BoLiNote2,请点击收取挂机资源
-BoLiNote3,点击学习
-BoLiNote4,点击挑战BOSS
-BoLiNote5,让我们打开冒险日记吧
+BoLiNote3,请点击队伍
+BoLiNote4,请选择角色
+BoLiNote5,一键穿戴所有装备
 BoLiNote6,请点击角色按钮
 BoLiNote7,请点击转职按钮
 BoLiNote8,请点击角色按钮

Assets/Content/Prefabs/StoryComic/CN/30/2.prefab

@@ -173,12 +173,12 @@ PrefabInstance:
     - target: {fileID: 5415919180492318083, guid: 6f85e0ff2d0010c47aef87d6ce67e915,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 241
+      value: 338
       objectReference: {fileID: 0}
     - target: {fileID: 5415919180492318083, guid: 6f85e0ff2d0010c47aef87d6ce67e915,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 230
+      value: 317
       objectReference: {fileID: 0}
     - target: {fileID: 5415919180492318083, guid: 6f85e0ff2d0010c47aef87d6ce67e915,
         type: 3}

Assets/Lua/Config/ForceGuideCfg.lua

@@ -10,7 +10,7 @@ local ForceGuideCfg = {
 ['MaskCloseTime']=500,
 ['MaskOpenTime']=0,
 ['BoLiPos']={-128.2, 159},
-['BoLiNote']='BoLiNote4',
+['BoLiNote']='BoLiNote1',
 ['ExpandSize']={100,100},
 ['CenterOffset']={0,0},
 ['LogicLua']='',
@@ -33,12 +33,61 @@ local ForceGuideCfg = {
 ['LogicLua']='',
 ['LuaParam']='10015',
 },
--- 第3个强制引导：MOMO引导
+-- 第3个强制引导：佩戴装备
 [3]={
 ['Id']=3,
 ['Group']=3,
 ['Type']=0,
 ['UIId']=2,
+['Path']='role.icon',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={-119,137},
+['BoLiNote']='BoLiNote3',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+[4]={
+['Id']=4,
+['Group']=3,
+['Type']=0,
+['UIId']=3004,
+['Path']='hero1.roleLua.gameObject',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={0,272},
+['BoLiNote']='BoLiNote4',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+[5]={
+['Id']=5,
+['Group']=3,
+['Type']=0,
+['UIId']=3005,
+['Path']='btnOneKeyEquip',
+['MaskCloseDelayTime']=500,
+['MaskCloseTime']=500,
+['MaskOpenTime']=0,
+['BoLiPos']={-156,137},
+['BoLiNote']='BoLiNote5',
+['ExpandSize']={100,100},
+['CenterOffset']={0,0},
+['LogicLua']='',
+['LuaParam']='',
+},
+-- 第4个强制引导：MOMO引导
+[6]={
+['Id']=6,
+['Group']=999,
+['Type']=0,
+['UIId']=2,
 ['Path']='feiGeBtn.icon',
 ['MaskCloseDelayTime']=500,
 ['MaskCloseTime']=500,
@@ -50,9 +99,9 @@ local ForceGuideCfg = {
 ['LogicLua']='',
 ['LuaParam']='',
 },
-[4]={
-['Id']=4,
-['Group']=3,
+[7]={
+['Id']=7,
+['Group']=999,
 ['Type']=0,
 ['UIId']=142,
 ['Path']='searchTabBtn',
@@ -66,9 +115,9 @@ local ForceGuideCfg = {
 ['LogicLua']='',
 ['LuaParam']='',
 },
-[5]={
-['Id']=5,
-['Group']=3,
+[8]={
+['Id']=8,
+['Group']=999,
 ['Type']=0,
 ['UIId']=142,
 ['Path']='searchTabGreetBtn1',
@@ -83,55 +132,6 @@ local ForceGuideCfg = {
 ['LuaParam']='',
 },
 
--- 第4个强制引导：佩戴装备
-[6]={
-['Id']=6,
-['Group']=4,
-['Type']=0,
-['UIId']=2,
-['Path']='role.icon',
-['MaskCloseDelayTime']=500,
-['MaskCloseTime']=500,
-['MaskOpenTime']=0,
-['BoLiPos']={-498,-5},
-['BoLiNote']='BoLiNote4',
-['ExpandSize']={100,100},
-['CenterOffset']={0,0},
-['LogicLua']='',
-['LuaParam']='',
-},
-[7]={
-['Id']=7,
-['Group']=4,
-['Type']=0,
-['UIId']=3004,
-['Path']='hero1.roleLua.gameObject',
-['MaskCloseDelayTime']=500,
-['MaskCloseTime']=500,
-['MaskOpenTime']=0,
-['BoLiPos']={4,210},
-['BoLiNote']='BoLiNote39',
-['ExpandSize']={100,100},
-['CenterOffset']={0,0},
-['LogicLua']='',
-['LuaParam']='',
-},
-[8]={
-['Id']=8,
-['Group']=4,
-['Type']=0,
-['UIId']=3005,
-['Path']='btnOneKeyEquip',
-['MaskCloseDelayTime']=500,
-['MaskCloseTime']=500,
-['MaskOpenTime']=0,
-['BoLiPos']={-221,260},
-['BoLiNote']='BoLiNote40',
-['ExpandSize']={100,100},
-['CenterOffset']={0,0},
-['LogicLua']='',
-['LuaParam']='',
-},
 -- 第5个强制引导：回复NPC发来的消息
 [9]={
 ['Id']=9,

Assets/Lua/Config/LevelCfg1.lua

@@ -209,7 +209,7 @@ local LevelCfg1 = {
 ['DlgId']=0,
 ['DlgContentId']=0,
 ['StorySection']=0,
-['ForceGuideGroup']=0,
+['ForceGuideGroup']=2,
 ['LevelPointType']=1,
 ['LevelPointCoordinate']={683,137},
 ['BossKey']='',
@@ -279,9 +279,9 @@ local LevelCfg1 = {
 ['BossId']=90016007,
 ['DropTimes']=0,
 ['DlgId']=0,
-['DlgContentId']=202,
+['DlgContentId']=0,
 ['StorySection']=2001008,
-['ForceGuideGroup']=2,
+['ForceGuideGroup']=3,
 ['LevelPointType']=1,
 ['LevelPointCoordinate']={745,374},
 ['BossKey']='',

Assets/Lua/Config/UIFuncUnLockCfg.lua

@@ -589,7 +589,7 @@ local UIFuncUnLockCfg = {
 ['Id']=35,
 ['UIId']=4,
 ['FuncEnterPath']='ReceiveGo',
-['UnlockCond']={{11,10008}},
+['UnlockCond']={{11,10006}},
 ['LockNotice']='FunUnLock',
 ['FunIcon']='',
 ['FunName']='Fun32',
@@ -613,7 +613,7 @@ local UIFuncUnLockCfg = {
 ['Id']=36,
 ['UIId']=2,
 ['FuncEnterPath']='role.icon',
-['UnlockCond']={{11,10009}},
+['UnlockCond']={{11,10008}},
 ['LockNotice']='FunUnLock',
 ['FunIcon']='',
 ['FunName']='Fun31',