diff --git a/Assets/Lua/Config/StoryCfgV2.lua b/Assets/Lua/Config/StoryCfgV2.lua index fd8a2849a..485bbcd16 100644 --- a/Assets/Lua/Config/StoryCfgV2.lua +++ b/Assets/Lua/Config/StoryCfgV2.lua @@ -57,46 +57,10 @@ local StoryCfgV2 = { ['Id']=40, ['StoryId']=40, ['StoryTitle']='STITLE40', -['Type']=1, -['StoryNpcId']=104, -['MapLevel']=10016, -['StoryIntro']={'玩家与希芙女神在神域的外围再次偶遇,那时希芙正在遭受巨人们的围攻。玩家将希芙从巨人的包围中救出,希芙终于认可了这位英勇的少年。'}, -['SelectionTexts']={'SOPT41','SOPT42'}, -['SelectionNext']={41,42}, -['NeedBg']=false, -['HideUi']=false, -['Transition']=false, -['TransitionType']=3, -['Skip']=false, -['PlayInterval']=5, -['ProgramControl']=true, -['NeedSave']=true, -['ForceGuideGroup']=0, -}, -[41]={ -['Id']=41, -['StoryId']=41, -['StoryTitle']='STITLE41', -['Type']=1, -['StoryNpcId']=104, -['MapLevel']=10016, -['NeedBg']=false, -['HideUi']=false, -['Transition']=false, -['TransitionType']=3, -['Skip']=false, -['PlayInterval']=5, -['ProgramControl']=true, -['NeedSave']=false, -['ForceGuideGroup']=0, -}, -[42]={ -['Id']=42, -['StoryId']=42, -['StoryTitle']='STITLE42', -['Type']=1, -['StoryNpcId']=104, +['Type']=0, +['StoryNpcId']=0, ['MapLevel']=10016, +['StoryIntro']={1,2,3,4,5,6,7,8,9,10,11}, ['NeedBg']=false, ['HideUi']=false, ['Transition']=false, diff --git a/Assets/Lua/Config/StroyPerformCfgV21.lua b/Assets/Lua/Config/StroyPerformCfgV21.lua index 35662520b..15d64d32a 100644 --- a/Assets/Lua/Config/StroyPerformCfgV21.lua +++ b/Assets/Lua/Config/StroyPerformCfgV21.lua @@ -1,610 +1,4 @@ local StroyPerformCfgV21 = { -[4001]={ -['Id']=4001, -['StoryId']=40, -['Type']=1, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4001', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4002]={ -['Id']=4002, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4002', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4003]={ -['Id']=4003, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4003', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4004]={ -['Id']=4004, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4004', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4005]={ -['Id']=4005, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4005', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4006]={ -['Id']=4006, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4006', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4007]={ -['Id']=4007, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4007', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4008]={ -['Id']=4008, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4008', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4009]={ -['Id']=4009, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4009', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4010]={ -['Id']=4010, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4010', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4011]={ -['Id']=4011, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4011', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4012]={ -['Id']=4012, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4012', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4013]={ -['Id']=4013, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4013', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4014]={ -['Id']=4014, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4014', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4015]={ -['Id']=4015, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4015', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4016]={ -['Id']=4016, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4016', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4017]={ -['Id']=4017, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4017', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4018]={ -['Id']=4018, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4018', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4019]={ -['Id']=4019, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4019', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4020]={ -['Id']=4020, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4020', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4021]={ -['Id']=4021, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4021', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4022]={ -['Id']=4022, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4022', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4023]={ -['Id']=4023, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4023', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4024]={ -['Id']=4024, -['StoryId']=40, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4024', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4101]={ -['Id']=4101, -['StoryId']=41, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4101', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4102]={ -['Id']=4102, -['StoryId']=41, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4102', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4103]={ -['Id']=4103, -['StoryId']=41, -['Type']=0, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4103', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4104]={ -['Id']=4104, -['StoryId']=41, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4104', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4105]={ -['Id']=4105, -['StoryId']=41, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4105', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4201]={ -['Id']=4201, -['StoryId']=42, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4201', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4202]={ -['Id']=4202, -['StoryId']=42, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4202', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4203]={ -['Id']=4203, -['StoryId']=42, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4203', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4204]={ -['Id']=4204, -['StoryId']=42, -['Type']=0, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST4204', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[4205]={ -['Id']=4205, -['StoryId']=42, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST4205', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, [5001]={ ['Id']=5001, ['StoryId']=50, @@ -8865,5 +8259,605 @@ local StroyPerformCfgV21 = { ['WordTime']=10, ['OverTime']=0, }, +[25205]={ +['Id']=25205, +['StoryId']=252, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25205', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25206]={ +['Id']=25206, +['StoryId']=252, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25206', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25207]={ +['Id']=25207, +['StoryId']=252, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25207', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25301]={ +['Id']=25301, +['StoryId']=253, +['Type']=0, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25301', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25302]={ +['Id']=25302, +['StoryId']=253, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25302', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25303]={ +['Id']=25303, +['StoryId']=253, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25303', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25304]={ +['Id']=25304, +['StoryId']=253, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25304', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25305]={ +['Id']=25305, +['StoryId']=253, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25305', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[25306]={ +['Id']=25306, +['StoryId']=253, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST25306', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26001]={ +['Id']=26001, +['StoryId']=260, +['Type']=0, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26001', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26002]={ +['Id']=26002, +['StoryId']=260, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26002', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26003]={ +['Id']=26003, +['StoryId']=260, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26003', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26004]={ +['Id']=26004, +['StoryId']=260, +['Type']=0, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST26004', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26005]={ +['Id']=26005, +['StoryId']=260, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26005', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26006]={ +['Id']=26006, +['StoryId']=260, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26006', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26101]={ +['Id']=26101, +['StoryId']=261, +['Type']=0, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26101', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26102]={ +['Id']=26102, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26102', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26103]={ +['Id']=26103, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26103', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26104]={ +['Id']=26104, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26104', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26105]={ +['Id']=26105, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST26105', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26106]={ +['Id']=26106, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26106', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26107]={ +['Id']=26107, +['StoryId']=261, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26107', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26201]={ +['Id']=26201, +['StoryId']=262, +['Type']=0, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26201', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26202]={ +['Id']=26202, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26202', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26203]={ +['Id']=26203, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26203', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26204]={ +['Id']=26204, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26204', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26205]={ +['Id']=26205, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26205', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26206]={ +['Id']=26206, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST26206', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[26207]={ +['Id']=26207, +['StoryId']=262, +['Type']=0, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_xifu', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_xifu', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST26207', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[27001]={ +['Id']=27001, +['StoryId']=270, +['Type']=1, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST27001', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[27002]={ +['Id']=27002, +['StoryId']=270, +['Type']=1, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST27002', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[27003]={ +['Id']=27003, +['StoryId']=270, +['Type']=1, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST27003', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[27004]={ +['Id']=27004, +['StoryId']=270, +['Type']=1, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST27004', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[27101]={ +['Id']=27101, +['StoryId']=271, +['Type']=0, +['LeftActBgTime']=0, +['RightActBgTime']=0, +['LeftName']='actor_haila', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_haila', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST27101', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, } return StroyPerformCfgV21 \ No newline at end of file diff --git a/Assets/Lua/Config/StroyPerformCfgV22.lua b/Assets/Lua/Config/StroyPerformCfgV22.lua index 9902c4c39..df5538d00 100644 --- a/Assets/Lua/Config/StroyPerformCfgV22.lua +++ b/Assets/Lua/Config/StroyPerformCfgV22.lua @@ -1,604 +1,4 @@ local StroyPerformCfgV22 = { -[25205]={ -['Id']=25205, -['StoryId']=252, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25205', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25206]={ -['Id']=25206, -['StoryId']=252, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25206', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25207]={ -['Id']=25207, -['StoryId']=252, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25207', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25301]={ -['Id']=25301, -['StoryId']=253, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25301', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25302]={ -['Id']=25302, -['StoryId']=253, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25302', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25303]={ -['Id']=25303, -['StoryId']=253, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25303', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25304]={ -['Id']=25304, -['StoryId']=253, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25304', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25305]={ -['Id']=25305, -['StoryId']=253, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25305', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[25306]={ -['Id']=25306, -['StoryId']=253, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST25306', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26001]={ -['Id']=26001, -['StoryId']=260, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26001', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26002]={ -['Id']=26002, -['StoryId']=260, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26002', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26003]={ -['Id']=26003, -['StoryId']=260, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26003', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26004]={ -['Id']=26004, -['StoryId']=260, -['Type']=0, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST26004', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26005]={ -['Id']=26005, -['StoryId']=260, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26005', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26006]={ -['Id']=26006, -['StoryId']=260, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26006', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26101]={ -['Id']=26101, -['StoryId']=261, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26101', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26102]={ -['Id']=26102, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26102', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26103]={ -['Id']=26103, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26103', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26104]={ -['Id']=26104, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26104', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26105]={ -['Id']=26105, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST26105', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26106]={ -['Id']=26106, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26106', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26107]={ -['Id']=26107, -['StoryId']=261, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26107', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26201]={ -['Id']=26201, -['StoryId']=262, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26201', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26202]={ -['Id']=26202, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26202', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26203]={ -['Id']=26203, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26203', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26204]={ -['Id']=26204, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26204', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26205]={ -['Id']=26205, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26205', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26206]={ -['Id']=26206, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST26206', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[26207]={ -['Id']=26207, -['StoryId']=262, -['Type']=0, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_xifu', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_xifu', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST26207', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[27001]={ -['Id']=27001, -['StoryId']=270, -['Type']=1, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST27001', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[27002]={ -['Id']=27002, -['StoryId']=270, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST27002', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[27003]={ -['Id']=27003, -['StoryId']=270, -['Type']=1, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST27003', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[27004]={ -['Id']=27004, -['StoryId']=270, -['Type']=1, -['LeftAct']='RoleMovein', -['LeftActBgTime']=0, -['RightAct']='RoleMoveout', -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST27004', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[27101]={ -['Id']=27101, -['StoryId']=271, -['Type']=0, -['LeftActBgTime']=0, -['RightActBgTime']=0, -['LeftName']='actor_haila', -['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_haila', -['RightNameColour']='title01', -['SpeakSite']=1, -['SpeakId']='ST27101', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, [27102]={ ['Id']=27102, ['StoryId']=271, diff --git a/Assets/Lua/Config/UIRedPointCfg.lua b/Assets/Lua/Config/UIRedPointCfg.lua index 901c9b21b..89f6b43e2 100644 --- a/Assets/Lua/Config/UIRedPointCfg.lua +++ b/Assets/Lua/Config/UIRedPointCfg.lua @@ -558,7 +558,7 @@ local UIRedPointCfg = { ['SameTarget']={93}, ['Priority']=1, ['Position']={66,50}, -['NoPay']=true, +['NoPay']=false, }, [56]={ ['Id']=56, diff --git a/Assets/Lua/Managers/RedPointSimpleMgr.lua b/Assets/Lua/Managers/RedPointSimpleMgr.lua index 1bfcb8d5e..b4ea34ca0 100644 --- a/Assets/Lua/Managers/RedPointSimpleMgr.lua +++ b/Assets/Lua/Managers/RedPointSimpleMgr.lua @@ -173,7 +173,8 @@ end function RedPointSimpleMgr:RefreshRedPointDisplayPriority(treeNode, needCheckLock) AW.async(function() - AW.await(self:WaitFillContentCompeleted()) + --AW.await(self:WaitFillContentCompeleted()) + if _isFillContentCompeleted == false then return end if needCheckLock then local unlockState = self:CheckRPLockState(treeNode) if not unlockState then @@ -247,6 +248,7 @@ function RedPointSimpleMgr:RefreshRedPointDisplayPriority(treeNode, needCheckLoc end) end +local _isFillContentCompeleted = false local __waitCallback__ = function() end function RedPointSimpleMgr:WaitFillContentCompeleted() local func = function(cb) @@ -291,6 +293,7 @@ function RedPointSimpleMgr:FillContentCompeleted(wnd) end end end + _isFillContentCompeleted = true end) end diff --git a/Assets/Lua/UI/UIBag/UIBagView.lua b/Assets/Lua/UI/UIBag/UIBagView.lua index f59fe3f7e..47209918d 100644 --- a/Assets/Lua/UI/UIBag/UIBagView.lua +++ b/Assets/Lua/UI/UIBag/UIBagView.lua @@ -516,7 +516,6 @@ end --resetPos为true则重置位置到0 function UIBagView:RefreshViewPage(resetPos) - LogError("~~~~~~~~~~~~ RefreshViewPage ~~~~~~~~~~~~~~") resetPos = resetPos or true local bagViewPageType = self.controller:GetBagViewPageType() if self.NoticeItemList then diff --git a/Assets/Lua/UI/UIMain/UIMainView.lua b/Assets/Lua/UI/UIMain/UIMainView.lua index 4e68bbbb4..cbc009199 100644 --- a/Assets/Lua/UI/UIMain/UIMainView.lua +++ b/Assets/Lua/UI/UIMain/UIMainView.lua @@ -284,7 +284,7 @@ function UIMainView:AddEventListener() ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.EID_RECORD_STORY_FINISH, self, self.OnRecordStoryFinish) ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.EID_UI_RETURN_HOME, self, self.OnUIReturnHome) - + ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.ITEM_CHANGE, self, self.OnRedPointMgrNotice) -- NEWUI --[[ ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.EID_NEWUI_OPEN, function(uiData)