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

Assets/Content/Config/LanguagePackageV2_cn.csv

@@ -25,6 +25,7 @@ SINTRO1006,头部介绍7
 SINTRO1007,头部介绍8
 SINTRO1008,头部介绍9
 SINTRO1009,头部介绍10
+STITLE10,（开篇无任务标题）
 ST1001,话说，你让我做的这些真的有用吗……
 ST1002,你是说把手机发给各界这件事？
 ST1003,是啊，我已经传信给奥丁，让他把你给的这数亿叫作……额……手机的东西发给诸界的各种族了。
@@ -50,6 +51,10 @@ SOPT21,我妈教我看着对方是表示尊重的行为
 SOPT22,别误会，我是在观察吊绳的位置想怎么救你
 SOPT23,这可是看妹子内内的大好机会啊
 SINTRO2000,玩家救下了少女，而少女怨怼地望了玩家一眼便愤愤离去。玩家想起该使用手机上的MOMO系统寻找女神了，很快玩家就发现了第一位可以撩的对象。
+STITLE20,春光乍泄怪我咯
+STITLE21,春光乍泄怪我咯
+STITLE22,春光乍泄怪我咯
+STITLE23,春光乍泄怪我咯
 ST2001,你好小姐姐！能在万千人海中找到你即使缘分，可否能认识一下？
 ST2002,嗯，我是希芙，刚拿到这个叫手机的东西没多久，就遇到你啦
 ST2003,你好像是中庭人？
@@ -91,6 +96,9 @@ ST2305,你夸我也没用！我不管，这事儿没完！
 SOPT31,你如此聪明伶俐又温柔善良
 SOPT32,你这样世间万物都为之倾倒的绝美少女
 SINTRO3000,玩家想起自己还不知晓去往神域的路，而呼唤命运女神也没有反应。看来只好问一问刚刚那位女神了，希望她的气消了一些……
+STITLE30,没想到你喜欢捆绑！
+STITLE31,没想到你喜欢捆绑！
+STITLE32,没想到你喜欢捆绑！
 ST3001,果然还是不能原谅你！我要把你删了！
 ST3002,希望这段孽缘早点结束
 ST3003,等一下先别删我！
@@ -136,6 +144,9 @@ ST3206,太好了，你真是人美心善！
 SOPT41,我不动你，放心吧
 SOPT42,这么一个大美女，难免会想一想的嘛
 SINTRO4000,玩家与希芙女神在神域的外围再次偶遇，那时希芙正在遭受巨人们的围攻。玩家将希芙从巨人的包围中救出，希芙终于认可了这位英勇的少年。
+STITLE40,放开那女孩，让我来！
+STITLE41,放开那女孩，让我来！
+STITLE42,放开那女孩，让我来！
 ST4001,刚才……谢谢你为我解围
 ST4002,举手之劳嘛，我怎么舍得让这样一个美人儿陷入苦战呢
 ST4003,看来你也没那么坏嘛
@@ -174,6 +185,10 @@ SOPT51,没事啦，相信自己才是对的，我也相信你的能力
 SOPT52,怎么突然这么正式，不像你的风格诶
 SOPT53,你都请我“大饱眼福”了，这种还算什么？
 SINTRO5000,经历了上次的事情，以及共同对抗了几次强敌，希芙逐渐对玩家心生了些许好感。
+STITLE50,一份女神的礼物
+STITLE51,一份女神的礼物
+STITLE52,一份女神的礼物
+STITLE53,一份女神的礼物
 ST5001,在吗？
 ST5002,想说什么，可爱的小希芙？
 ST5003,你真讨厌，我脸会红的！
@@ -212,6 +227,9 @@ ST5308,没有！只有普通的歉礼，爱要不要！
 ST5309,[giftRewardId-5005]
 SOPT61,小弟弟？你年纪比我大吗？
 SOPT62,掌管生育？那是什么？
+STITLE60,生育女神要找我去生育？
+STITLE61,生育女神要找我去生育？
+STITLE62,生育女神要找我去生育？
 ST6001,你好美女！相逢即是缘分，可以聊聊天吗？
 ST6002,你是来自异界的救世主吧？
 ST6003,这你都知道？
@@ -243,6 +261,7 @@ ST6209,庆祝会后，英灵殿后面的小花园
 ST6210,我在那里等你，让你见识下女神的“待客之道”哟～
 ST6211,[dateRewardId-6002]
 SINTRO7000,玩家抵达阿斯加德神域，参加了奥丁在英灵殿举办的欢迎会。酒过三巡之后……
+STITLE70,（新章节直接衔接无任务标题）
 ST7001,这欢迎会弄得可真热闹啊！
 ST7002,时间差不多了……该去和那位生育女神会面了。
 ST7003,没想到刚来这个世界没多久，就碰上妹子投怀送抱这种好事，嘿嘿……
@@ -262,6 +281,10 @@ ST7016,唔……
 SOPT81,喝了些酒之后的感觉确实舒服
 SOPT82,舒服的感觉？是发生什么了吗？
 SOPT83,酒喝多了确实不好
+STITLE80,那天晚上发生了什么？
+STITLE81,那天晚上发生了什么？
+STITLE82,那天晚上发生了什么？
+STITLE83,那天晚上发生了什么？
 ST8001,你好美女，能聊聊天吗？希望没有打扰你的午后时光～
 ST8002,你好呀，我是芙蕾雅，第一次用这个叫手机的东西，你还是第一个找到我的人呢
 ST8003,那我可太荣幸了！你也是女神吧，最近怎么样？
@@ -292,6 +315,9 @@ ST8307,请忘掉吧
 SOPT91,好好好，下次一定来找你
 SOPT92,要不今晚？
 SINTRO9000,女神格欧费茵带着小小的埋怨再次找到玩家，而这次似乎带来了一个巨大的误会……
+STITLE90,昨晚的熟女究竟是谁？
+STITLE91,昨晚的熟女究竟是谁？
+STITLE92,昨晚的熟女究竟是谁？
 ST9001,昨天晚上你怎么没来找人家？
 ST9002,我们的救世主小可爱？
 ST9003,女神也有健忘症？
@@ -317,6 +343,9 @@ ST9205,我会等着你的哦，小救世主～
 SOPT101,今晚我可以来陪你
 SOPT102,寂寞的话，想要聊天我一直都在
 SINTRO10000,芙蕾雅从昏昏沉沉的状态中清醒，想起应该和玩家表示一下午后聊天失态的歉意。
+STITLE100,独自在家很寂寞？
+STITLE101,独自在家很寂寞？
+STITLE102,独自在家很寂寞？
 ST10001,实在不好意思，之前和你聊天我有些失态了
 ST10002,现在清醒些了……想一想之前和你聊的话题，确实有些令人羞耻……
 ST10003,没关系，我很乐意倾听美女的任何烦恼！
@@ -344,6 +373,9 @@ ST10205,哼哼，有些东西可不能随便就说出来
 SOPT111,让我当你的人体模特怎么样？随你怎么量尺寸
 SOPT112,肉偿行不行？
 SINTRO11000,自从上次的交谈与送礼后，玩家和希芙的关系日趋变好。今天这位美少女又带来了新的话题。
+STITLE110,我的英姿这么迷人吗？
+STITLE111,我的英姿这么迷人吗？
+STITLE112,我的英姿这么迷人吗？
 ST11001,今天织围巾的时候老走神，都怪你！
 ST11002,想着你战斗时的样子，结果织错了好多次，拆了重来累死我了！
 ST11003,这都要怪我？那我要怎么补偿你才好？
@@ -366,6 +398,10 @@ SOPT121,此话不假
 SOPT122,而且还很勇猛
 SOPT123,而且还很持久
 SINTRO12000,奥丁希望玩家去神域的北部讨伐来犯的霜巨人，虽然话好听，但玩家知道这是想测试自己身为救世主的实力如何。而这阵不被信任的烦闷又很快被收到的一张照片化解……
+STITLE120,这么诱惑为夫吗？
+STITLE121,这么诱惑为夫吗？
+STITLE122,这么诱惑为夫吗？
+STITLE123,这么诱惑为夫吗？
 ST12001,[photo-0202]
 ST12002,夫君，什么时候回来呀～
 ST12003,这可是特地为你穿的哦～
@@ -407,6 +443,10 @@ ST12304,[dateRewardId-12003]
 SOPT131,现在就想戴，顺便看看你
 SOPT132,要是我回不来怎么办？
 SOPT133,等我的好消息
+STITLE130,美少女的战前鼓舞
+STITLE131,美少女的战前鼓舞
+STITLE132,美少女的战前鼓舞
+STITLE133,美少女的战前鼓舞
 ST13001,听说你明天要去打霜巨人？
 ST13002,告诉你个好消息，我织的围巾终于完成啦！
 ST13003,虽然织错了好多次，但总算能送出手了
@@ -436,6 +476,7 @@ ST13304,战斗的时候不要分心哦
 ST13305,怎么会！小希芙的鼓舞让我浑身都充满了力量！
 ST13306,这……这样最好啦
 SINTRO14000,玩家打败了霜巨人，但自己也负伤昏迷，而醒来时发现自己身处一片果园。
+STITLE140,（新章节直接衔接无任务标题）
 ST14001,嘶……好痛……
 ST14002,我记得自己好像受伤了？这里是……？
 ST14003,大哥哥，不要乱动哦！
@@ -460,6 +501,10 @@ ST14021,有……有些忍不住了……
 SOPT151,感谢你，我的小天使
 SOPT152,整得我有些负罪感怎么回事？
 SOPT153,这其实是一种……反应啦
+STITLE150,把白色的毒排出去就好啦！
+STITLE151,把白色的毒排出去就好啦！
+STITLE152,把白色的毒排出去就好啦！
+STITLE153,把白色的毒排出去就好啦！
 ST15001,一位美丽动人的女神呢，咱们认识一下？
 ST15002,你说话可真好听！我是伊登，很高兴认识你！
 ST15003,这个小盒子真的能对话哎！
@@ -494,6 +539,9 @@ ST15306,嘿嘿，乖乖哦！
 SOPT161,是你女儿主动摸的……
 SOPT162,只是疗伤而已，想多了
 SINTRO16000,伊登的母亲目睹了治疗时发生的事，她的兴师问罪很快到来。
+STITLE160,来自伯母的问候
+STITLE161,来自伯母的问候
+STITLE162,来自伯母的问候
 ST16001,在吗？
 ST16002,怎么啦？
 ST16003,我是伊登的母亲，用她这个手机和你说些事情
@@ -515,6 +563,10 @@ ST16204,知道就好！别让我再看到你和她有来往！
 SOPT171,没有没有，其实是我不对啦
 SOPT172,没有哦，伊登做的很棒
 SOPT173,其实有些越描越黑啦……
+STITLE170,小萝莉的道歉
+STITLE171,小萝莉的道歉
+STITLE172,小萝莉的道歉
+STITLE173,小萝莉的道歉
 ST17001,那个……
 ST17002,伯母大人又有什么事？
 ST17003,我是伊登本人啦，刚才妈妈擅自用我的手机
@@ -541,6 +593,9 @@ ST17302,我会好好解释清楚的！
 ST17303,那个……下次有机会，我会亲自来和大哥哥道歉的！
 SOPT181,误会啊太太，我哪敢动什么坏心思
 SOPT182,不对你女儿有想法，难道要我对你有想法？
+STITLE180,居然测试我？
+STITLE181,居然测试我？
+STITLE182,居然测试我？
 ST18001,在不在？
 ST18002,怎么啦，迷人的小可爱？
 ST18003,又要跟我分享什么秘密吗？
@@ -563,6 +618,9 @@ ST18204,我如果需要治疗怎么办？
 ST18205,那就受着！反正别想让我女儿碰你！
 SOPT191,你可真机灵呀
 SOPT192,这样骗妈妈会不会不太好……
+STITLE190,拿回自己的号啦！
+STITLE191,拿回自己的号啦！
+STITLE192,拿回自己的号啦！
 ST19001,抱歉抱歉！是我不好大哥哥！
 ST19002,伯母，这又是哪一出？
 ST19003,我是伊登啦，不是我妈妈在和你消息
@@ -593,6 +651,10 @@ SOPT201,走神时腿是不是并紧了？
 SOPT202,我也在想你给我织围巾的模样
 SOPT203,围巾上都是你的味道，让我有些受不了
 SINTRO20000,玩家想起等待自己的希芙，迫不及待去见了面，拿到了少女赠送给自己的围巾。
+STITLE200,如你所愿在做奇怪的事
+STITLE201,如你所愿在做奇怪的事
+STITLE202,如你所愿在做奇怪的事
+STITLE203,如你所愿在做奇怪的事
 ST20001,喂！你戴着我的围巾有没有做奇怪的事吧？
 ST20002,正在做啊，裹着它想你的腰有多软
 ST20003,啊，变态！
@@ -623,6 +685,10 @@ ST20305,再聊围巾要变成情趣用品了！
 SOPT211,还是有很多美好的事物的
 SOPT212,不能以偏概全啊，也有互相帮助的
 SOPT213,你们这种美女才是我要拯救的对象啊！
+STITLE210,冥界的女王
+STITLE211,冥界的女王
+STITLE212,冥界的女王
+STITLE213,冥界的女王
 ST21001,这位美女你好呀，感觉是气质很独特的类型呢
 ST21002,哼，吾乃冥界女王海拉
 ST21003,你是谁？居然可以在这个叫手机的东西上直接联系我？
@@ -659,6 +725,7 @@ ST21307,冥界的女王也不是你能随便泡的
 ST21308,那要看女王大人给不给我机会了
 ST21309,油嘴滑舌
 SINTRO22000,光明神巴德尔被黑暗神杀死，灵魂去往了冥界，奥丁与众神希望救世主能够将巴德尔的灵魂带回来将之复活，于是玩家来到了冥界。
+STITLE220,（新章节直接衔接无任务标题）
 ST22001,巴德尔！你在不在？
 ST22002,我在这里！你是神界派来的吗？
 ST22003,太好了，终于找到你了！
@@ -681,6 +748,10 @@ SOPT231,确实很爽
 SOPT232,女王的每一鞭都抽到了我的心里
 SOPT233,你给我等着！总有一天……
 SINTRO23000,玩家熬过了海拉的惩罚，带着光明神巴德尔回到了神界。恰巧此时这位冥界女王发来了消息……
+STITLE230,被抽得爽不爽？
+STITLE231,被抽得爽不爽？
+STITLE232,被抽得爽不爽？
+STITLE233,被抽得爽不爽？
 ST23001,今天遇到一个不识好歹的家伙，想从我的地盘带人走
 ST23002,被我好好调教了一番
 ST23003,不过他的意志力确实不错，到最后都没有屈服
@@ -706,6 +777,10 @@ SOPT241,也许和你的丈夫很像
 SOPT242,那就说明我是你心目中的理想型
 SOPT243,我明明很温柔的
 SINTRO24000,自从上次和芙蕾雅共度了良宵，玩家和芙蕾雅之间的关系更近了一步……
+STITLE240,熟悉的火热感觉
+STITLE241,熟悉的火热感觉
+STITLE242,熟悉的火热感觉
+STITLE243,熟悉的火热感觉
 ST24001,在吗？
 ST24002,怎么了？这才没过多久，又心痒痒了？
 ST24003,小坏蛋～就知道打趣我
@@ -736,6 +811,10 @@ ST24307,呀，我之前要说什么来着？
 SOPT251,我可不会轻易屈服
 SOPT252,当女王的玩具有什么好处？
 SOPT253,我可听话了，女王大人尽管吩咐
+STITLE250,女王大人的玩具
+STITLE251,女王大人的玩具
+STITLE252,女王大人的玩具
+STITLE253,女王大人的玩具
 ST25001,最近调教的家伙都感觉没什么意思了……
 ST25002,感觉还是你比较好玩
 ST25003,我是玩具吗？
@@ -761,6 +840,9 @@ ST25305,我会在这里给我的玩具一些惩罚……以及奖励
 ST25306,[dateRewardId-25004]
 SOPT261,听起来有点……诱人？
 SOPT262,真可惜看不到你小心翼翼的样子
+STITLE260,裙子要掉下来了怎么办？
+STITLE261,裙子要掉下来了怎么办？
+STITLE262,裙子要掉下来了怎么办？
 ST26001,今天果园收获了好多金苹果！
 ST26002,小伊登喊我去帮忙来着
 ST26003,但是搬筐子的时候太用力，裙子的肩带好像被扯松了……现在总觉得要掉不掉的
@@ -785,6 +867,10 @@ SOPT271,这份温柔只是对我？
 SOPT272,没感觉出来
 SOPT273,我更喜欢粗暴一点
 SINTRO27000,玩家赴约冥界，又被海拉狠狠玩弄了一番，但相较上一次，这位女王好像更加温柔了一些……
+STITLE270,臣服于女王的温柔
+STITLE271,臣服于女王的温柔
+STITLE272,臣服于女王的温柔
+STITLE273,臣服于女王的温柔
 ST27001,感觉怎么样，有没有臣服我的想法？
 ST27002,确实……厉害
 ST27003,感觉得缓好几天……
@@ -810,6 +896,10 @@ ST27305,等待也是惩罚你的一环～
 SOPT281,我的那个有什么特别之处？
 SOPT282,下次我要给你戴上
 SOPT283,我可没有做宠物的癖好
+STITLE280,这不会是定情信物吧？
+STITLE281,这不会是定情信物吧？
+STITLE282,这不会是定情信物吧？
+STITLE283,这不会是定情信物吧？
 ST28001,嘿，我说
 ST28002,有个好东西要给你
 ST28003,送我东西？是什么？
@@ -848,6 +938,10 @@ ST28307,[giftRewardId-28005]
 SOPT291,要不要我帮你拿回来？
 SOPT292,所以你现在没穿袜子？
 SOPT293,小鸟还挺会挑
+STITLE290,丝袜被偷走了怎么办？
+STITLE291,丝袜被偷走了怎么办？
+STITLE292,丝袜被偷走了怎么办？
+STITLE293,丝袜被偷走了怎么办？
 ST29001,今天花园里发生件可恶的事！
 ST29002,有只小鸟偷了我晾在树枝上的丝袜，现在正当窝用呢！
 ST29003,这鸟还挺有品味
@@ -879,6 +973,10 @@ ST29307,你也讨厌！
 SOPT301,听起来蛮热血的
 SOPT302,其实我很向往这样的生活
 SOPT303,会不会太没有女人味了？
+STITLE300,女神也有豪爽的！
+STITLE301,女神也有豪爽的！
+STITLE302,女神也有豪爽的！
+STITLE303,女神也有豪爽的！
 ST30001,嗨，这位女神，我们认识一下？
 ST30002,哈哈，叫咱瓦尔基里就行，女武神
 ST30003,我是一粗人，这叫什么手机的东西我都研究了半天才会用呢！
@@ -909,6 +1007,7 @@ ST30306,明天有个给救世主办的庆功宴，你要想看女武神的女人
 ST30307,会看到你吗？
 ST30308,那当然！我肯定会去！
 SINTRO31000,为了庆祝玩家将光明神巴尔德带回神界，奥丁大摆筵席。席间女武神前来为玩家倒酒庆贺……
+STITLE310,（新章节直接衔接无任务标题）
 ST31001,救世主大人……我来为你倒酒。
 ST31002,请尽兴吧。
 ST31003,哇，这么美的姑娘给我倒酒！
@@ -928,6 +1027,9 @@ ST31016,你们都是我的翅膀。今晚，我们一起共度良宵，如何？
 SOPT321,其实我猜到哪一个是你了
 SOPT322,无所谓，美女都一样嘛
 SINTRO32000,宴会结束和两位女武神逍遥了一晚，第二天收到了瓦尔基里的消息。
+STITLE320,昨晚哪一个是你？
+STITLE321,昨晚哪一个是你？
+STITLE322,昨晚哪一个是你？
 ST32001,昨天的庆功会可热闹了！
 ST32002,救世主威风凛凛的，我想过去和他亲热一下来着
 ST32003,被手底下一个小丫头差点捷足先登！
@@ -960,6 +1062,10 @@ ST32207,不过现在，谁追随谁还是待定～
 SOPT331,你是说，女武神都喜欢我？
 SOPT332,我有些好奇赌注是什么
 SOPT333,最喜欢我的是谁啊？
+STITLE330,第一个推倒救世主的赌约
+STITLE331,第一个推倒救世主的赌约
+STITLE332,第一个推倒救世主的赌约
+STITLE333,第一个推倒救世主的赌约
 ST33001,其实，上次之所以着急忙慌地……想要占有你……
 ST33002,是因为一个赌约
 ST33003,赌约？难道不是我的个人魅力？
@@ -991,6 +1097,10 @@ SOPT341,姜饼应该很好吃吧
 SOPT342,糖吃太多会蛀牙哦
 SOPT343,为什么想要和我冒险
 SINTRO34000,上次和伊登在果园的约见玩得很开心，而如今这个小可爱又找到了玩家……
+STITLE340,冒险与童话
+STITLE341,冒险与童话
+STITLE342,冒险与童话
+STITLE343,冒险与童话
 ST34001,锵锵！我又来啦！
 ST34002,上次一起玩很开心，这几天都做了很好很好的梦！
 ST34003,哦？梦里都是些什么？
@@ -1027,6 +1137,10 @@ ST34311,[giftRewardId-34005]
 SOPT351,那我再给你补偿回来？
 SOPT352,女武神也是信奉强者为上的啊
 SOPT353,她确实比你要厉害
+STITLE350,不输大姐头的女武神！
+STITLE351,不输大姐头的女武神！
+STITLE352,不输大姐头的女武神！
+STITLE353,不输大姐头的女武神！
 ST35001,这位姐姐，初次见面，高兴和我聊聊天吗？
 ST35002,哈，我是女武神诗嘉古尔
 ST35003,这么巧，那看来不是初次见面了
@@ -1064,6 +1178,10 @@ ST35306,下次有机会……哼，也让你看看什么叫真正的本事！
 SOPT361,哇哦，这算约会邀请吗？
 SOPT362,麦田啊……让我想起一些在田野里发生的羞羞故事~
 SOPT363,就咱俩？你该不会是想对我做什么奇怪的事吧？
+STITLE360,约见彩虹桥
+STITLE361,约见彩虹桥
+STITLE362,约见彩虹桥
+STITLE363,约见彩虹桥
 ST36001,喂喂~我发现了个超棒的地方！
 ST36002,金灿灿的麦田，晚上还会发光诶！要不要一起去看看呀？
 ST36101,才不是约会呢！就是……就是普通的一起看风景！
@@ -1086,6 +1204,9 @@ ST36305,嘿，真好拿捏
 ST36306,[dateRewardId-36003]
 SOPT371,我喜欢我喜欢！
 SOPT372,有意义的东西是指？
+STITLE370,接受女王的赏赐
+STITLE371,接受女王的赏赐
+STITLE372,接受女王的赏赐
 ST37001,今天我的仆从在整理时……
 ST37002,发现了一些不该出现在冥界的东西
 ST37003,冥界也有失物招领处？
@@ -1109,6 +1230,10 @@ ST37207,[giftRewardId-37003]
 SOPT381,你这是在挑衅我吗？
 SOPT382,喝醉了有什么后果？
 SOPT383,就我们两个人喝？
+STITLE380,女神的比酒量邀约
+STITLE381,女神的比酒量邀约
+STITLE382,女神的比酒量邀约
+STITLE383,女神的比酒量邀约
 ST38001,嘿！新到了一批千年蜜酒，敢来尝尝吗？
 ST38002,保证让你见识下什么才是真正的烈酒
 ST38003,有多烈？
@@ -1137,6 +1262,10 @@ ST38307,[dateRewardId-38004]
 SOPT391,我可以帮你系好衣带
 SOPT392,蝴蝶后来停在哪里了？
 SOPT393,做梦时有没有其他感觉？
+STITLE390,春日的梦与蝴蝶
+STITLE391,春日的梦与蝴蝶
+STITLE392,春日的梦与蝴蝶
+STITLE393,春日的梦与蝴蝶
 ST39001,刚在花园小憩时做了个有趣的梦~
 ST39002,梦见有只蝴蝶总在我胸口徘徊，赶也赶不走……
 ST39003,春天的蝴蝶确实很缠人
@@ -1166,6 +1295,10 @@ SOPT401,刻着什么字？
 SOPT402,为什么要送人？
 SOPT403,该不会是要送我？
 SINTRO40000,上次与瓦尔基里喝酒十分尽兴，而次日，她打扫时似乎发现了什么……
+STITLE400,酒桶底下的宝贝
+STITLE401,酒桶底下的宝贝
+STITLE402,酒桶底下的宝贝
+STITLE403,酒桶底下的宝贝
 ST40001,嘿！记得上次咱喝的那几桶酒吗？
 ST40002,有一桶底下，我发现了些宝贝！
 ST40003,藏了不知道多少年的老物件，上面还刻着字呢~

Assets/Content/Raw_Art/UI/UIMainNew/task_current_bg.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: ea8114105a479eb4eb362c0f94818cca
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 34, y: 23, z: 20, w: 65}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/UIMainNew/task_icon.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: be6c7845fe852094aa44b82cdea614f8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/UIMainNew/task_icon_finish.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 53425ed03cc26e6488640b54b6d0aa8a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/UIMainNew/task_icon_unfinish.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 9e21d226baacd9e41958505115c6706b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Raw_Art/UI/UIMainNew/task_next_bg.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 1ea0f856ed91f964e9ef9361260ba832
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Config/StoryCfgV2.lua

@@ -2,6 +2,7 @@ local StoryCfgV2 = {
 [10]={
 ['Id']=10,
 ['StoryId']=10,
+['StoryTitle']='STITLE10',
 ['Type']=0,
 ['StoryNpcId']=101,
 ['MapLevel']=10001,
@@ -19,6 +20,7 @@ local StoryCfgV2 = {
 [20]={
 ['Id']=20,
 ['StoryId']=20,
+['StoryTitle']='STITLE20',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10005,
@@ -38,6 +40,7 @@ local StoryCfgV2 = {
 [21]={
 ['Id']=21,
 ['StoryId']=21,
+['StoryTitle']='STITLE21',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10005,
@@ -54,6 +57,7 @@ local StoryCfgV2 = {
 [22]={
 ['Id']=22,
 ['StoryId']=22,
+['StoryTitle']='STITLE22',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10005,
@@ -70,6 +74,7 @@ local StoryCfgV2 = {
 [23]={
 ['Id']=23,
 ['StoryId']=23,
+['StoryTitle']='STITLE23',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10005,
@@ -86,6 +91,7 @@ local StoryCfgV2 = {
 [30]={
 ['Id']=30,
 ['StoryId']=30,
+['StoryTitle']='STITLE30',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10010,
@@ -105,6 +111,7 @@ local StoryCfgV2 = {
 [31]={
 ['Id']=31,
 ['StoryId']=31,
+['StoryTitle']='STITLE31',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10010,
@@ -121,6 +128,7 @@ local StoryCfgV2 = {
 [32]={
 ['Id']=32,
 ['StoryId']=32,
+['StoryTitle']='STITLE32',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10010,
@@ -137,6 +145,7 @@ local StoryCfgV2 = {
 [40]={
 ['Id']=40,
 ['StoryId']=40,
+['StoryTitle']='STITLE40',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10015,
@@ -156,6 +165,7 @@ local StoryCfgV2 = {
 [41]={
 ['Id']=41,
 ['StoryId']=41,
+['StoryTitle']='STITLE41',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10015,
@@ -172,6 +182,7 @@ local StoryCfgV2 = {
 [42]={
 ['Id']=42,
 ['StoryId']=42,
+['StoryTitle']='STITLE42',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10015,
@@ -188,6 +199,7 @@ local StoryCfgV2 = {
 [50]={
 ['Id']=50,
 ['StoryId']=50,
+['StoryTitle']='STITLE50',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10020,
@@ -207,6 +219,7 @@ local StoryCfgV2 = {
 [51]={
 ['Id']=51,
 ['StoryId']=51,
+['StoryTitle']='STITLE51',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10020,
@@ -223,6 +236,7 @@ local StoryCfgV2 = {
 [52]={
 ['Id']=52,
 ['StoryId']=52,
+['StoryTitle']='STITLE52',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10020,
@@ -239,6 +253,7 @@ local StoryCfgV2 = {
 [53]={
 ['Id']=53,
 ['StoryId']=53,
+['StoryTitle']='STITLE53',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=10020,
@@ -255,6 +270,7 @@ local StoryCfgV2 = {
 [60]={
 ['Id']=60,
 ['StoryId']=60,
+['StoryTitle']='STITLE60',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=10025,
@@ -273,6 +289,7 @@ local StoryCfgV2 = {
 [61]={
 ['Id']=61,
 ['StoryId']=61,
+['StoryTitle']='STITLE61',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=10025,
@@ -289,6 +306,7 @@ local StoryCfgV2 = {
 [62]={
 ['Id']=62,
 ['StoryId']=62,
+['StoryTitle']='STITLE62',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=10025,
@@ -305,6 +323,7 @@ local StoryCfgV2 = {
 [70]={
 ['Id']=70,
 ['StoryId']=70,
+['StoryTitle']='STITLE70',
 ['Type']=0,
 ['StoryNpcId']=201,
 ['MapLevel']=20001,
@@ -322,6 +341,7 @@ local StoryCfgV2 = {
 [80]={
 ['Id']=80,
 ['StoryId']=80,
+['StoryTitle']='STITLE80',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20005,
@@ -340,6 +360,7 @@ local StoryCfgV2 = {
 [81]={
 ['Id']=81,
 ['StoryId']=81,
+['StoryTitle']='STITLE81',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20005,
@@ -356,6 +377,7 @@ local StoryCfgV2 = {
 [82]={
 ['Id']=82,
 ['StoryId']=82,
+['StoryTitle']='STITLE82',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20005,
@@ -372,6 +394,7 @@ local StoryCfgV2 = {
 [83]={
 ['Id']=83,
 ['StoryId']=83,
+['StoryTitle']='STITLE83',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20005,
@@ -388,6 +411,7 @@ local StoryCfgV2 = {
 [90]={
 ['Id']=90,
 ['StoryId']=90,
+['StoryTitle']='STITLE90',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=20010,
@@ -407,6 +431,7 @@ local StoryCfgV2 = {
 [91]={
 ['Id']=91,
 ['StoryId']=91,
+['StoryTitle']='STITLE91',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=20010,
@@ -423,6 +448,7 @@ local StoryCfgV2 = {
 [92]={
 ['Id']=92,
 ['StoryId']=92,
+['StoryTitle']='STITLE92',
 ['Type']=1,
 ['StoryNpcId']=105,
 ['MapLevel']=20010,
@@ -439,6 +465,7 @@ local StoryCfgV2 = {
 [100]={
 ['Id']=100,
 ['StoryId']=100,
+['StoryTitle']='STITLE100',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20015,
@@ -458,6 +485,7 @@ local StoryCfgV2 = {
 [101]={
 ['Id']=101,
 ['StoryId']=101,
+['StoryTitle']='STITLE101',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20015,
@@ -474,6 +502,7 @@ local StoryCfgV2 = {
 [102]={
 ['Id']=102,
 ['StoryId']=102,
+['StoryTitle']='STITLE102',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20015,
@@ -490,6 +519,7 @@ local StoryCfgV2 = {
 [110]={
 ['Id']=110,
 ['StoryId']=110,
+['StoryTitle']='STITLE110',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20020,
@@ -509,6 +539,7 @@ local StoryCfgV2 = {
 [111]={
 ['Id']=111,
 ['StoryId']=111,
+['StoryTitle']='STITLE111',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20020,
@@ -525,6 +556,7 @@ local StoryCfgV2 = {
 [112]={
 ['Id']=112,
 ['StoryId']=112,
+['StoryTitle']='STITLE112',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20020,
@@ -541,6 +573,7 @@ local StoryCfgV2 = {
 [120]={
 ['Id']=120,
 ['StoryId']=120,
+['StoryTitle']='STITLE120',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20025,
@@ -560,6 +593,7 @@ local StoryCfgV2 = {
 [121]={
 ['Id']=121,
 ['StoryId']=121,
+['StoryTitle']='STITLE121',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20025,
@@ -576,6 +610,7 @@ local StoryCfgV2 = {
 [122]={
 ['Id']=122,
 ['StoryId']=122,
+['StoryTitle']='STITLE122',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20025,
@@ -592,6 +627,7 @@ local StoryCfgV2 = {
 [123]={
 ['Id']=123,
 ['StoryId']=123,
+['StoryTitle']='STITLE123',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=20025,
@@ -608,6 +644,7 @@ local StoryCfgV2 = {
 [130]={
 ['Id']=130,
 ['StoryId']=130,
+['StoryTitle']='STITLE130',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20030,
@@ -626,6 +663,7 @@ local StoryCfgV2 = {
 [131]={
 ['Id']=131,
 ['StoryId']=131,
+['StoryTitle']='STITLE131',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20030,
@@ -642,6 +680,7 @@ local StoryCfgV2 = {
 [132]={
 ['Id']=132,
 ['StoryId']=132,
+['StoryTitle']='STITLE132',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20030,
@@ -658,6 +697,7 @@ local StoryCfgV2 = {
 [133]={
 ['Id']=133,
 ['StoryId']=133,
+['StoryTitle']='STITLE133',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=20030,
@@ -674,6 +714,7 @@ local StoryCfgV2 = {
 [140]={
 ['Id']=140,
 ['StoryId']=140,
+['StoryTitle']='STITLE140',
 ['Type']=0,
 ['StoryNpcId']=301,
 ['MapLevel']=30001,
@@ -691,6 +732,7 @@ local StoryCfgV2 = {
 [150]={
 ['Id']=150,
 ['StoryId']=150,
+['StoryTitle']='STITLE150',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30005,
@@ -709,6 +751,7 @@ local StoryCfgV2 = {
 [151]={
 ['Id']=151,
 ['StoryId']=151,
+['StoryTitle']='STITLE151',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30005,
@@ -725,6 +768,7 @@ local StoryCfgV2 = {
 [152]={
 ['Id']=152,
 ['StoryId']=152,
+['StoryTitle']='STITLE152',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30005,
@@ -741,6 +785,7 @@ local StoryCfgV2 = {
 [153]={
 ['Id']=153,
 ['StoryId']=153,
+['StoryTitle']='STITLE153',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30005,
@@ -757,6 +802,7 @@ local StoryCfgV2 = {
 [160]={
 ['Id']=160,
 ['StoryId']=160,
+['StoryTitle']='STITLE160',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30010,
@@ -776,6 +822,7 @@ local StoryCfgV2 = {
 [161]={
 ['Id']=161,
 ['StoryId']=161,
+['StoryTitle']='STITLE161',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30010,
@@ -792,6 +839,7 @@ local StoryCfgV2 = {
 [162]={
 ['Id']=162,
 ['StoryId']=162,
+['StoryTitle']='STITLE162',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30010,
@@ -808,6 +856,7 @@ local StoryCfgV2 = {
 [170]={
 ['Id']=170,
 ['StoryId']=170,
+['StoryTitle']='STITLE170',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30015,
@@ -826,6 +875,7 @@ local StoryCfgV2 = {
 [171]={
 ['Id']=171,
 ['StoryId']=171,
+['StoryTitle']='STITLE171',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30015,
@@ -842,6 +892,7 @@ local StoryCfgV2 = {
 [172]={
 ['Id']=172,
 ['StoryId']=172,
+['StoryTitle']='STITLE172',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30015,
@@ -858,6 +909,7 @@ local StoryCfgV2 = {
 [173]={
 ['Id']=173,
 ['StoryId']=173,
+['StoryTitle']='STITLE173',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30015,
@@ -874,6 +926,7 @@ local StoryCfgV2 = {
 [180]={
 ['Id']=180,
 ['StoryId']=180,
+['StoryTitle']='STITLE180',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30020,
@@ -892,6 +945,7 @@ local StoryCfgV2 = {
 [181]={
 ['Id']=181,
 ['StoryId']=181,
+['StoryTitle']='STITLE181',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30020,
@@ -908,6 +962,7 @@ local StoryCfgV2 = {
 [182]={
 ['Id']=182,
 ['StoryId']=182,
+['StoryTitle']='STITLE182',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30020,
@@ -924,6 +979,7 @@ local StoryCfgV2 = {
 [190]={
 ['Id']=190,
 ['StoryId']=190,
+['StoryTitle']='STITLE190',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30025,
@@ -942,6 +998,7 @@ local StoryCfgV2 = {
 [191]={
 ['Id']=191,
 ['StoryId']=191,
+['StoryTitle']='STITLE191',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30025,
@@ -958,6 +1015,7 @@ local StoryCfgV2 = {
 [192]={
 ['Id']=192,
 ['StoryId']=192,
+['StoryTitle']='STITLE192',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=30025,
@@ -974,6 +1032,7 @@ local StoryCfgV2 = {
 [200]={
 ['Id']=200,
 ['StoryId']=200,
+['StoryTitle']='STITLE200',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=30030,
@@ -993,6 +1052,7 @@ local StoryCfgV2 = {
 [201]={
 ['Id']=201,
 ['StoryId']=201,
+['StoryTitle']='STITLE201',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=30030,
@@ -1009,6 +1069,7 @@ local StoryCfgV2 = {
 [202]={
 ['Id']=202,
 ['StoryId']=202,
+['StoryTitle']='STITLE202',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=30030,
@@ -1025,6 +1086,7 @@ local StoryCfgV2 = {
 [203]={
 ['Id']=203,
 ['StoryId']=203,
+['StoryTitle']='STITLE203',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=30030,
@@ -1041,6 +1103,7 @@ local StoryCfgV2 = {
 [210]={
 ['Id']=210,
 ['StoryId']=210,
+['StoryTitle']='STITLE210',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=30035,
@@ -1059,6 +1122,7 @@ local StoryCfgV2 = {
 [211]={
 ['Id']=211,
 ['StoryId']=211,
+['StoryTitle']='STITLE211',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=30035,
@@ -1075,6 +1139,7 @@ local StoryCfgV2 = {
 [212]={
 ['Id']=212,
 ['StoryId']=212,
+['StoryTitle']='STITLE212',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=30035,
@@ -1091,6 +1156,7 @@ local StoryCfgV2 = {
 [213]={
 ['Id']=213,
 ['StoryId']=213,
+['StoryTitle']='STITLE213',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=30035,
@@ -1107,6 +1173,7 @@ local StoryCfgV2 = {
 [220]={
 ['Id']=220,
 ['StoryId']=220,
+['StoryTitle']='STITLE220',
 ['Type']=0,
 ['StoryNpcId']=401,
 ['MapLevel']=40001,
@@ -1124,6 +1191,7 @@ local StoryCfgV2 = {
 [230]={
 ['Id']=230,
 ['StoryId']=230,
+['StoryTitle']='STITLE230',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40005,
@@ -1143,6 +1211,7 @@ local StoryCfgV2 = {
 [231]={
 ['Id']=231,
 ['StoryId']=231,
+['StoryTitle']='STITLE231',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40005,
@@ -1159,6 +1228,7 @@ local StoryCfgV2 = {
 [232]={
 ['Id']=232,
 ['StoryId']=232,
+['StoryTitle']='STITLE232',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40005,
@@ -1175,6 +1245,7 @@ local StoryCfgV2 = {
 [233]={
 ['Id']=233,
 ['StoryId']=233,
+['StoryTitle']='STITLE233',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40005,
@@ -1191,6 +1262,7 @@ local StoryCfgV2 = {
 [240]={
 ['Id']=240,
 ['StoryId']=240,
+['StoryTitle']='STITLE240',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40010,
@@ -1210,6 +1282,7 @@ local StoryCfgV2 = {
 [241]={
 ['Id']=241,
 ['StoryId']=241,
+['StoryTitle']='STITLE241',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40010,
@@ -1226,6 +1299,7 @@ local StoryCfgV2 = {
 [242]={
 ['Id']=242,
 ['StoryId']=242,
+['StoryTitle']='STITLE242',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40010,
@@ -1242,6 +1316,7 @@ local StoryCfgV2 = {
 [243]={
 ['Id']=243,
 ['StoryId']=243,
+['StoryTitle']='STITLE243',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40010,
@@ -1258,6 +1333,7 @@ local StoryCfgV2 = {
 [250]={
 ['Id']=250,
 ['StoryId']=250,
+['StoryTitle']='STITLE250',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40015,
@@ -1276,6 +1352,7 @@ local StoryCfgV2 = {
 [251]={
 ['Id']=251,
 ['StoryId']=251,
+['StoryTitle']='STITLE251',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40015,
@@ -1292,6 +1369,7 @@ local StoryCfgV2 = {
 [252]={
 ['Id']=252,
 ['StoryId']=252,
+['StoryTitle']='STITLE252',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40015,
@@ -1308,6 +1386,7 @@ local StoryCfgV2 = {
 [253]={
 ['Id']=253,
 ['StoryId']=253,
+['StoryTitle']='STITLE253',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40015,
@@ -1324,6 +1403,7 @@ local StoryCfgV2 = {
 [260]={
 ['Id']=260,
 ['StoryId']=260,
+['StoryTitle']='STITLE260',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40020,
@@ -1342,6 +1422,7 @@ local StoryCfgV2 = {
 [261]={
 ['Id']=261,
 ['StoryId']=261,
+['StoryTitle']='STITLE261',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40020,
@@ -1358,6 +1439,7 @@ local StoryCfgV2 = {
 [262]={
 ['Id']=262,
 ['StoryId']=262,
+['StoryTitle']='STITLE262',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40020,
@@ -1374,6 +1456,7 @@ local StoryCfgV2 = {
 [270]={
 ['Id']=270,
 ['StoryId']=270,
+['StoryTitle']='STITLE270',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40025,
@@ -1393,6 +1476,7 @@ local StoryCfgV2 = {
 [271]={
 ['Id']=271,
 ['StoryId']=271,
+['StoryTitle']='STITLE271',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40025,
@@ -1409,6 +1493,7 @@ local StoryCfgV2 = {
 [272]={
 ['Id']=272,
 ['StoryId']=272,
+['StoryTitle']='STITLE272',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40025,
@@ -1425,6 +1510,7 @@ local StoryCfgV2 = {
 [273]={
 ['Id']=273,
 ['StoryId']=273,
+['StoryTitle']='STITLE273',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=40025,
@@ -1441,6 +1527,7 @@ local StoryCfgV2 = {
 [280]={
 ['Id']=280,
 ['StoryId']=280,
+['StoryTitle']='STITLE280',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40030,
@@ -1459,6 +1546,7 @@ local StoryCfgV2 = {
 [281]={
 ['Id']=281,
 ['StoryId']=281,
+['StoryTitle']='STITLE281',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40030,
@@ -1475,6 +1563,7 @@ local StoryCfgV2 = {
 [282]={
 ['Id']=282,
 ['StoryId']=282,
+['StoryTitle']='STITLE282',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40030,
@@ -1491,6 +1580,7 @@ local StoryCfgV2 = {
 [283]={
 ['Id']=283,
 ['StoryId']=283,
+['StoryTitle']='STITLE283',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=40030,
@@ -1507,6 +1597,7 @@ local StoryCfgV2 = {
 [290]={
 ['Id']=290,
 ['StoryId']=290,
+['StoryTitle']='STITLE290',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40035,
@@ -1525,6 +1616,7 @@ local StoryCfgV2 = {
 [291]={
 ['Id']=291,
 ['StoryId']=291,
+['StoryTitle']='STITLE291',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40035,
@@ -1541,6 +1633,7 @@ local StoryCfgV2 = {
 [292]={
 ['Id']=292,
 ['StoryId']=292,
+['StoryTitle']='STITLE292',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40035,
@@ -1557,6 +1650,7 @@ local StoryCfgV2 = {
 [293]={
 ['Id']=293,
 ['StoryId']=293,
+['StoryTitle']='STITLE293',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=40035,
@@ -1573,6 +1667,7 @@ local StoryCfgV2 = {
 [300]={
 ['Id']=300,
 ['StoryId']=300,
+['StoryTitle']='STITLE300',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=40040,
@@ -1591,6 +1686,7 @@ local StoryCfgV2 = {
 [301]={
 ['Id']=301,
 ['StoryId']=301,
+['StoryTitle']='STITLE301',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=40040,
@@ -1607,6 +1703,7 @@ local StoryCfgV2 = {
 [302]={
 ['Id']=302,
 ['StoryId']=302,
+['StoryTitle']='STITLE302',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=40040,
@@ -1623,6 +1720,7 @@ local StoryCfgV2 = {
 [303]={
 ['Id']=303,
 ['StoryId']=303,
+['StoryTitle']='STITLE303',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=40040,
@@ -1639,6 +1737,7 @@ local StoryCfgV2 = {
 [310]={
 ['Id']=310,
 ['StoryId']=310,
+['StoryTitle']='STITLE310',
 ['Type']=0,
 ['StoryNpcId']=501,
 ['MapLevel']=50001,
@@ -1656,6 +1755,7 @@ local StoryCfgV2 = {
 [320]={
 ['Id']=320,
 ['StoryId']=320,
+['StoryTitle']='STITLE320',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50005,
@@ -1675,6 +1775,7 @@ local StoryCfgV2 = {
 [321]={
 ['Id']=321,
 ['StoryId']=321,
+['StoryTitle']='STITLE321',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50005,
@@ -1691,6 +1792,7 @@ local StoryCfgV2 = {
 [322]={
 ['Id']=322,
 ['StoryId']=322,
+['StoryTitle']='STITLE322',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50005,
@@ -1707,6 +1809,7 @@ local StoryCfgV2 = {
 [330]={
 ['Id']=330,
 ['StoryId']=330,
+['StoryTitle']='STITLE330',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50010,
@@ -1725,6 +1828,7 @@ local StoryCfgV2 = {
 [331]={
 ['Id']=331,
 ['StoryId']=331,
+['StoryTitle']='STITLE331',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50010,
@@ -1741,6 +1845,7 @@ local StoryCfgV2 = {
 [332]={
 ['Id']=332,
 ['StoryId']=332,
+['StoryTitle']='STITLE332',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50010,
@@ -1757,6 +1862,7 @@ local StoryCfgV2 = {
 [333]={
 ['Id']=333,
 ['StoryId']=333,
+['StoryTitle']='STITLE333',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50010,
@@ -1773,6 +1879,7 @@ local StoryCfgV2 = {
 [340]={
 ['Id']=340,
 ['StoryId']=340,
+['StoryTitle']='STITLE340',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=50015,
@@ -1792,6 +1899,7 @@ local StoryCfgV2 = {
 [341]={
 ['Id']=341,
 ['StoryId']=341,
+['StoryTitle']='STITLE341',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=50015,
@@ -1808,6 +1916,7 @@ local StoryCfgV2 = {
 [342]={
 ['Id']=342,
 ['StoryId']=342,
+['StoryTitle']='STITLE342',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=50015,
@@ -1824,6 +1933,7 @@ local StoryCfgV2 = {
 [343]={
 ['Id']=343,
 ['StoryId']=343,
+['StoryTitle']='STITLE343',
 ['Type']=1,
 ['StoryNpcId']=301,
 ['MapLevel']=50015,
@@ -1840,6 +1950,7 @@ local StoryCfgV2 = {
 [350]={
 ['Id']=350,
 ['StoryId']=350,
+['StoryTitle']='STITLE350',
 ['Type']=1,
 ['StoryNpcId']=503,
 ['MapLevel']=50020,
@@ -1858,6 +1969,7 @@ local StoryCfgV2 = {
 [351]={
 ['Id']=351,
 ['StoryId']=351,
+['StoryTitle']='STITLE351',
 ['Type']=1,
 ['StoryNpcId']=503,
 ['MapLevel']=50020,
@@ -1874,6 +1986,7 @@ local StoryCfgV2 = {
 [352]={
 ['Id']=352,
 ['StoryId']=352,
+['StoryTitle']='STITLE352',
 ['Type']=1,
 ['StoryNpcId']=503,
 ['MapLevel']=50020,
@@ -1890,6 +2003,7 @@ local StoryCfgV2 = {
 [353]={
 ['Id']=353,
 ['StoryId']=353,
+['StoryTitle']='STITLE353',
 ['Type']=1,
 ['StoryNpcId']=503,
 ['MapLevel']=50020,
@@ -1906,6 +2020,7 @@ local StoryCfgV2 = {
 [360]={
 ['Id']=360,
 ['StoryId']=360,
+['StoryTitle']='STITLE360',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=50025,
@@ -1924,6 +2039,7 @@ local StoryCfgV2 = {
 [361]={
 ['Id']=361,
 ['StoryId']=361,
+['StoryTitle']='STITLE361',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=50025,
@@ -1940,6 +2056,7 @@ local StoryCfgV2 = {
 [362]={
 ['Id']=362,
 ['StoryId']=362,
+['StoryTitle']='STITLE362',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=50025,
@@ -1956,6 +2073,7 @@ local StoryCfgV2 = {
 [363]={
 ['Id']=363,
 ['StoryId']=363,
+['StoryTitle']='STITLE363',
 ['Type']=1,
 ['StoryNpcId']=104,
 ['MapLevel']=50025,
@@ -1972,6 +2090,7 @@ local StoryCfgV2 = {
 [370]={
 ['Id']=370,
 ['StoryId']=370,
+['StoryTitle']='STITLE370',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=50030,
@@ -1990,6 +2109,7 @@ local StoryCfgV2 = {
 [371]={
 ['Id']=371,
 ['StoryId']=371,
+['StoryTitle']='STITLE371',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=50030,
@@ -2006,6 +2126,7 @@ local StoryCfgV2 = {
 [372]={
 ['Id']=372,
 ['StoryId']=372,
+['StoryTitle']='STITLE372',
 ['Type']=1,
 ['StoryNpcId']=302,
 ['MapLevel']=50030,
@@ -2022,6 +2143,7 @@ local StoryCfgV2 = {
 [380]={
 ['Id']=380,
 ['StoryId']=380,
+['StoryTitle']='STITLE380',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50035,
@@ -2040,6 +2162,7 @@ local StoryCfgV2 = {
 [381]={
 ['Id']=381,
 ['StoryId']=381,
+['StoryTitle']='STITLE381',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50035,
@@ -2056,6 +2179,7 @@ local StoryCfgV2 = {
 [382]={
 ['Id']=382,
 ['StoryId']=382,
+['StoryTitle']='STITLE382',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50035,
@@ -2072,6 +2196,7 @@ local StoryCfgV2 = {
 [383]={
 ['Id']=383,
 ['StoryId']=383,
+['StoryTitle']='STITLE383',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50035,
@@ -2088,6 +2213,7 @@ local StoryCfgV2 = {
 [390]={
 ['Id']=390,
 ['StoryId']=390,
+['StoryTitle']='STITLE390',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=50040,
@@ -2106,6 +2232,7 @@ local StoryCfgV2 = {
 [391]={
 ['Id']=391,
 ['StoryId']=391,
+['StoryTitle']='STITLE391',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=50040,
@@ -2122,6 +2249,7 @@ local StoryCfgV2 = {
 [392]={
 ['Id']=392,
 ['StoryId']=392,
+['StoryTitle']='STITLE392',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=50040,
@@ -2138,6 +2266,7 @@ local StoryCfgV2 = {
 [393]={
 ['Id']=393,
 ['StoryId']=393,
+['StoryTitle']='STITLE393',
 ['Type']=1,
 ['StoryNpcId']=202,
 ['MapLevel']=50040,
@@ -2154,6 +2283,7 @@ local StoryCfgV2 = {
 [400]={
 ['Id']=400,
 ['StoryId']=400,
+['StoryTitle']='STITLE400',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50045,
@@ -2173,6 +2303,7 @@ local StoryCfgV2 = {
 [401]={
 ['Id']=401,
 ['StoryId']=401,
+['StoryTitle']='STITLE401',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50045,
@@ -2189,6 +2320,7 @@ local StoryCfgV2 = {
 [402]={
 ['Id']=402,
 ['StoryId']=402,
+['StoryTitle']='STITLE402',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50045,
@@ -2205,6 +2337,7 @@ local StoryCfgV2 = {
 [403]={
 ['Id']=403,
 ['StoryId']=403,
+['StoryTitle']='STITLE403',
 ['Type']=1,
 ['StoryNpcId']=402,
 ['MapLevel']=50045,

Assets/Lua/Config/StoryTaskCfgV2.lua

@@ -0,0 +1,48 @@
+local StoryTaskCfgV2 = {
+[1]={
+['Id']=1,
+['StoryId']=10,
+['SubTasks']={{1,10001},{1,10002},{1,10003},{1,10004},{1,10005},},
+},
+[2]={
+['Id']=2,
+['StoryId']=20,
+['SubTasks']={{1,10006},{1,10007},{1,10008},{1,10009},{1,10010},},
+},
+[3]={
+['Id']=3,
+['StoryId']=30,
+['SubTasks']={{1,10011},{1,10012},{1,10013},{1,10014},{1,10015},},
+},
+[4]={
+['Id']=4,
+['StoryId']=40,
+['SubTasks']={{1,10016},{1,10017},{1,10018},{1,10019},{1,10020},},
+},
+[5]={
+['Id']=5,
+['StoryId']=50,
+['SubTasks']={{1,10021},{1,10022},{1,10023},{1,10024},{1,10025},},
+},
+[6]={
+['Id']=6,
+['StoryId']=60,
+['SubTasks']={{1,10026},{1,10027},{1,10028},{1,10029},{1,10030},},
+},
+[7]={
+['Id']=7,
+['StoryId']=70,
+['SubTasks']={{1,20001},{1,20002},{1,20003},{1,20004},{1,20005},},
+},
+[8]={
+['Id']=8,
+['StoryId']=80,
+['SubTasks']={{1,20006},{1,20007},{1,20008},{1,20009},{1,20010},},
+},
+[9]={
+['Id']=9,
+['StoryId']=90,
+['SubTasks']={{1,20011},{1,20012},{1,20013},{1,20014},{1,20015},},
+},
+}
+return StoryTaskCfgV2

Assets/Lua/Config/StoryTaskCfgV2.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0aef008394210094bbb46f5548233da7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Managers/CfgMgr.lua

@@ -140,6 +140,7 @@ function CfgMgr:ctor()
     self.StoryNpcCfgV2 = InternalRequire("StoryNpcCfgV2")
     self.StoryRewardCfg = InternalRequire("StoryRewardCfg")
     self.StoryAICfgV2 = InternalRequire("StoryAICfgV2")
+    self.StoryTaskCfgV2 = InternalRequire("StoryTaskCfgV2")
 
     self.StoryItemCfg = InternalRequire("StoryItemCfg")
     self.ChatDateCfg = InternalRequire("ChatDateCfg")
@@ -185,6 +186,10 @@ function CfgMgr:GetCsvStoryPerformCfg(storyId)
 end
 ]]
 
+function CfgMgr:GetStoryTaskCfgV2()
+    return self.StoryTaskCfgV2
+end
+
 -- usage-0-打招呼, usage-1-送礼物
 function CfgMgr:GetStoryAICfgV2(storyNpcId)
     local cfgs = {}
@@ -273,27 +278,27 @@ function CfgMgr:GetStoryRewardCfg(id)
     return self.StoryRewardCfg[id]
 end
 
-function CfgMgr:GetTaskCfgV2ByMapLv(mapLv)
-    local currTaskCfgs = {}
-    local nextTaskCfgs = {}
-    local mainTask = -1
-    for k, v in pairs(self.TaskCfgV2) do
-        if v['MapLv'] == mapLv and v['StoryId'] == 0 then
-            mainTask = v['MainTask']
-        end
-    end
-    for k, v in pairs(self.TaskCfgV2) do
-        if v['MainTask'] == mainTask then
-            table.insert(currTaskCfgs, v)
-        end
-        if v['MainTask'] == mainTask + 1 then
-            table.insert(nextTaskCfgs, v)
-        end
-    end
-    table.sort(currTaskCfgs, function (a,b) return a.Id < b.Id end)
-    table.sort(nextTaskCfgs, function (a,b) return a.Id < b.Id end)
-    return currTaskCfgs, nextTaskCfgs
-end
+-- function CfgMgr:GetTaskCfgV2ByMapLv(mapLv)
+--     local currTaskCfgs = {}
+--     local nextTaskCfgs = {}
+--     local mainTask = -1
+--     for k, v in pairs(self.TaskCfgV2) do
+--         if v['MapLv'] == mapLv and v['StoryId'] == 0 then
+--             mainTask = v['MainTask']
+--         end
+--     end
+--     for k, v in pairs(self.TaskCfgV2) do
+--         if v['MainTask'] == mainTask then
+--             table.insert(currTaskCfgs, v)
+--         end
+--         if v['MainTask'] == mainTask + 1 then
+--             table.insert(nextTaskCfgs, v)
+--         end
+--     end
+--     table.sort(currTaskCfgs, function (a,b) return a.Id < b.Id end)
+--     table.sort(nextTaskCfgs, function (a,b) return a.Id < b.Id end)
+--     return currTaskCfgs, nextTaskCfgs
+-- end
 
 function CfgMgr:GetStoryNpcCfg()
     return self.StoryNpcCfgV2
@@ -1395,6 +1400,10 @@ function CfgMgr:GetCompetitionTypeRange()
     return min, max
 end
 
+function CfgMgr:GetStoryCfgV2()
+    return self.StoryCfgV2
+end
+
 function CfgMgr:GetStoryDataById(id)
     local cfg = self.StoryCfgV2[id]
     if cfg == nil then

Assets/Lua/UI/GridViewItem/LiveRoomItem_Generate.lua

@@ -1,28 +1,23 @@
----@class LiveRoomItem__Generate_idlePad_timer
+---@class LiveRoomItem__Generate_timer_text_time
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
 
----@class LiveRoomItem__Generate_idlePad
----@field public gameObject UnityEngine.GameObject
----@field public timer LiveRoomItem__Generate_idlePad_timer
-
----@class LiveRoomItem__Generate_resultPad_timer
+---@class LiveRoomItem__Generate_timer_text_name
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text TMPro.TextMeshProUGUI
 
+---@class LiveRoomItem__Generate_timer
+---@field public gameObject UnityEngine.GameObject
+---@field public text_name LiveRoomItem__Generate_timer_text_name
+---@field public text_time LiveRoomItem__Generate_timer_text_time
+
 ---@class LiveRoomItem__Generate_resultPad
 ---@field public gameObject UnityEngine.GameObject
 ---@field public rectTransform UnityEngine.RectTransform
----@field public timer LiveRoomItem__Generate_resultPad_timer
-
----@class LiveRoomItem__Generate_showPad_timer
----@field public gameObject UnityEngine.GameObject
----@field public text TMPro.TextMeshProUGUI
 
 ---@class LiveRoomItem__Generate_showPad
 ---@field public gameObject UnityEngine.GameObject
 ---@field public rectTransform UnityEngine.RectTransform
----@field public timer LiveRoomItem__Generate_showPad_timer
 
 ---@class LiveRoomItem__Generate_readyPad_readyBtn
 ---@field public gameObject UnityEngine.GameObject
@@ -120,14 +115,9 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
 
----@class LiveRoomItem__Generate_readyPad_timer
----@field public gameObject UnityEngine.GameObject
----@field public text TMPro.TextMeshProUGUI
-
 ---@class LiveRoomItem__Generate_readyPad
 ---@field public gameObject UnityEngine.GameObject
 ---@field public rectTransform UnityEngine.RectTransform
----@field public timer LiveRoomItem__Generate_readyPad_timer
 ---@field public readyitem LiveRoomItem__Generate_readyPad_readyitem
 ---@field public text_title LiveRoomItem__Generate_readyPad_text_title
 ---@field public head1 LiveRoomItem__Generate_readyPad_head1
@@ -298,7 +288,8 @@
 ---@field private readyPad LiveRoomItem__Generate_readyPad
 ---@field private showPad LiveRoomItem__Generate_showPad
 ---@field private resultPad LiveRoomItem__Generate_resultPad
----@field private idlePad LiveRoomItem__Generate_idlePad
+---@field private idlePad UnityEngine.GameObject
+---@field private timer LiveRoomItem__Generate_timer
 local LiveRoomItemView = class("LiveRoomItemView")
 
 function LiveRoomItemView:ctor()
@@ -380,7 +371,6 @@ function LiveRoomItemView:InitGenerate(Root, data)
 	self:InitGenerate__63(Root,data)
 	self:InitGenerate__64(Root,data)
 	self:InitGenerate__65(Root,data)
-	self:InitGenerate__66(Root,data)
 
 
 end
@@ -838,20 +828,6 @@ end
 
 ---@private
 function LiveRoomItemView:InitGenerate__35(Root, data)
---[[
-	BottomSafe/ReadyPad/time_bg/Timer
---]]
-	local tmp = Root:Find("BottomSafe/ReadyPad/time_bg/Timer").gameObject
-	if tolua.getpeer(tmp) == nil then
-		tolua.setpeer(tmp, {})
-	end
-	self.readyPad.timer = tmp
-
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
-end
-
----@private
-function LiveRoomItemView:InitGenerate__36(Root, data)
 --[[
 	BottomSafe/ReadyPad/readyitem
 --]]
@@ -866,7 +842,7 @@ function LiveRoomItemView:InitGenerate__36(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__37(Root, data)
+function LiveRoomItemView:InitGenerate__36(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/text_title
 --]]
@@ -880,7 +856,7 @@ function LiveRoomItemView:InitGenerate__37(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__38(Root, data)
+function LiveRoomItemView:InitGenerate__37(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head1
 --]]
@@ -892,7 +868,7 @@ function LiveRoomItemView:InitGenerate__38(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__39(Root, data)
+function LiveRoomItemView:InitGenerate__38(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head1/head_img
 --]]
@@ -906,7 +882,7 @@ function LiveRoomItemView:InitGenerate__39(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__40(Root, data)
+function LiveRoomItemView:InitGenerate__39(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head2
 --]]
@@ -918,7 +894,7 @@ function LiveRoomItemView:InitGenerate__40(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__41(Root, data)
+function LiveRoomItemView:InitGenerate__40(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head2/head_img
 --]]
@@ -932,7 +908,7 @@ function LiveRoomItemView:InitGenerate__41(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__42(Root, data)
+function LiveRoomItemView:InitGenerate__41(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head3
 --]]
@@ -944,7 +920,7 @@ function LiveRoomItemView:InitGenerate__42(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__43(Root, data)
+function LiveRoomItemView:InitGenerate__42(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head3/head_img
 --]]
@@ -958,7 +934,7 @@ function LiveRoomItemView:InitGenerate__43(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__44(Root, data)
+function LiveRoomItemView:InitGenerate__43(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head4
 --]]
@@ -970,7 +946,7 @@ function LiveRoomItemView:InitGenerate__44(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__45(Root, data)
+function LiveRoomItemView:InitGenerate__44(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head4/head_img
 --]]
@@ -984,7 +960,7 @@ function LiveRoomItemView:InitGenerate__45(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__46(Root, data)
+function LiveRoomItemView:InitGenerate__45(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head5
 --]]
@@ -996,7 +972,7 @@ function LiveRoomItemView:InitGenerate__46(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__47(Root, data)
+function LiveRoomItemView:InitGenerate__46(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head5/head_img
 --]]
@@ -1010,7 +986,7 @@ function LiveRoomItemView:InitGenerate__47(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__48(Root, data)
+function LiveRoomItemView:InitGenerate__47(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head6
 --]]
@@ -1022,7 +998,7 @@ function LiveRoomItemView:InitGenerate__48(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__49(Root, data)
+function LiveRoomItemView:InitGenerate__48(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head6/head_img
 --]]
@@ -1036,7 +1012,7 @@ function LiveRoomItemView:InitGenerate__49(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__50(Root, data)
+function LiveRoomItemView:InitGenerate__49(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head7
 --]]
@@ -1048,7 +1024,7 @@ function LiveRoomItemView:InitGenerate__50(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__51(Root, data)
+function LiveRoomItemView:InitGenerate__50(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head7/head_img
 --]]
@@ -1062,7 +1038,7 @@ function LiveRoomItemView:InitGenerate__51(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__52(Root, data)
+function LiveRoomItemView:InitGenerate__51(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head8
 --]]
@@ -1074,7 +1050,7 @@ function LiveRoomItemView:InitGenerate__52(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__53(Root, data)
+function LiveRoomItemView:InitGenerate__52(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head8/head_img
 --]]
@@ -1088,7 +1064,7 @@ function LiveRoomItemView:InitGenerate__53(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__54(Root, data)
+function LiveRoomItemView:InitGenerate__53(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head9
 --]]
@@ -1100,7 +1076,7 @@ function LiveRoomItemView:InitGenerate__54(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__55(Root, data)
+function LiveRoomItemView:InitGenerate__54(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head9/head_img
 --]]
@@ -1114,7 +1090,7 @@ function LiveRoomItemView:InitGenerate__55(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__56(Root, data)
+function LiveRoomItemView:InitGenerate__55(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head10
 --]]
@@ -1126,7 +1102,7 @@ function LiveRoomItemView:InitGenerate__56(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__57(Root, data)
+function LiveRoomItemView:InitGenerate__56(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/rect_head/heads/head10/head_img
 --]]
@@ -1140,7 +1116,7 @@ function LiveRoomItemView:InitGenerate__57(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__58(Root, data)
+function LiveRoomItemView:InitGenerate__57(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/card_bg
 --]]
@@ -1152,7 +1128,7 @@ function LiveRoomItemView:InitGenerate__58(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__59(Root, data)
+function LiveRoomItemView:InitGenerate__58(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/card_bg/text
 --]]
@@ -1166,7 +1142,7 @@ function LiveRoomItemView:InitGenerate__59(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__60(Root, data)
+function LiveRoomItemView:InitGenerate__59(Root, data)
 --[[
 	BottomSafe/ReadyPad/rect/ReadyBtn
 --]]
@@ -1180,7 +1156,7 @@ function LiveRoomItemView:InitGenerate__60(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__61(Root, data)
+function LiveRoomItemView:InitGenerate__60(Root, data)
 --[[
 	BottomSafe/ShowPad
 --]]
@@ -1194,21 +1170,7 @@ function LiveRoomItemView:InitGenerate__61(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__62(Root, data)
---[[
-	BottomSafe/ShowPad/time_bg/Timer
---]]
-	local tmp = Root:Find("BottomSafe/ShowPad/time_bg/Timer").gameObject
-	if tolua.getpeer(tmp) == nil then
-		tolua.setpeer(tmp, {})
-	end
-	self.showPad.timer = tmp
-
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
-end
-
----@private
-function LiveRoomItemView:InitGenerate__63(Root, data)
+function LiveRoomItemView:InitGenerate__61(Root, data)
 --[[
 	BottomSafe/ResultPad
 --]]
@@ -1222,21 +1184,7 @@ function LiveRoomItemView:InitGenerate__63(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__64(Root, data)
---[[
-	BottomSafe/ResultPad/time_bg/Timer
---]]
-	local tmp = Root:Find("BottomSafe/ResultPad/time_bg/Timer").gameObject
-	if tolua.getpeer(tmp) == nil then
-		tolua.setpeer(tmp, {})
-	end
-	self.resultPad.timer = tmp
-
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
-end
-
----@private
-function LiveRoomItemView:InitGenerate__65(Root, data)
+function LiveRoomItemView:InitGenerate__62(Root, data)
 --[[
 	BottomSafe/IdlePad
 --]]
@@ -1248,29 +1196,52 @@ function LiveRoomItemView:InitGenerate__65(Root, data)
 end
 
 ---@private
-function LiveRoomItemView:InitGenerate__66(Root, data)
+function LiveRoomItemView:InitGenerate__63(Root, data)
 --[[
-	BottomSafe/IdlePad/time_bg/Timer
+	Timer
 --]]
-	local tmp = Root:Find("BottomSafe/IdlePad/time_bg/Timer").gameObject
+	local tmp = Root:Find("Timer").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.idlePad.timer = tmp
+	self.timer = tmp
+end
+
+---@private
+function LiveRoomItemView:InitGenerate__64(Root, data)
+--[[
+	Timer/text_name
+--]]
+	local tmp = Root:Find("Timer/text_name").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.timer.text_name = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+end
+
+---@private
+function LiveRoomItemView:InitGenerate__65(Root, data)
+--[[
+	Timer/text_time
+--]]
+	local tmp = Root:Find("Timer/text_time").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.timer.text_time = tmp
 
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
 ---@private
 function LiveRoomItemView:GenerateDestroy()
-	if tolua.getpeer(self.idlePad.timer) ~= nil then
-		tolua.setpeer(self.idlePad.timer, nil)
+	if tolua.getpeer(self.timer.text_time) ~= nil then
+		tolua.setpeer(self.timer.text_time, nil)
 	end
-	if tolua.getpeer(self.resultPad.timer) ~= nil then
-		tolua.setpeer(self.resultPad.timer, nil)
-	end
-	if tolua.getpeer(self.showPad.timer) ~= nil then
-		tolua.setpeer(self.showPad.timer, nil)
+	if tolua.getpeer(self.timer.text_name) ~= nil then
+		tolua.setpeer(self.timer.text_name, nil)
 	end
 	if tolua.getpeer(self.readyPad.readyBtn) ~= nil then
 		tolua.setpeer(self.readyPad.readyBtn, nil)
@@ -1350,9 +1321,6 @@ function LiveRoomItemView:GenerateDestroy()
 	if tolua.getpeer(self.readyPad.readyitem) ~= nil then
 		tolua.setpeer(self.readyPad.readyitem, nil)
 	end
-	if tolua.getpeer(self.readyPad.timer) ~= nil then
-		tolua.setpeer(self.readyPad.timer, nil)
-	end
 	if tolua.getpeer(self.inputBar.sv_gift) ~= nil then
 		tolua.setpeer(self.inputBar.sv_gift, nil)
 	end
@@ -1471,6 +1439,10 @@ function LiveRoomItemView:GenerateDestroy()
 		tolua.setpeer(self.idlePad, nil)
 	end
 	self.idlePad = nil
+	if tolua.getpeer(self.timer) ~= nil then
+		tolua.setpeer(self.timer, nil)
+	end
+	self.timer = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UIBattle/UIBattleView.lua

@@ -66,6 +66,7 @@ function UIBattleView:FillContent(data, uiBase)
 
 	needRefreshMinimap = true
 	self.MapRootGo:SetActive(true)
+	self.taskInfo:SetActive(true)
 	--self.ProfitBoxGo:SetActive(true)
 end
 
@@ -150,6 +151,8 @@ function UIBattleView:Init()
 
 	-- TODO: 临时屏蔽聊天界面
 	self.NewBattleChatPart:HideView()
+
+	self:RefreshStoryTaskInfo()
 end
 
 function UIBattleView:InitMinimapGoes()
@@ -160,6 +163,99 @@ function UIBattleView:InitMinimapGoes()
 	end
 end
 
+function UIBattleView:RefreshStoryTaskInfo()
+	-- 先获取当前关卡，再查找当前关卡对应的StoryId，通过StoryId分析出当前Story和接下来2个Story
+	-- 获取到了当前Story，再分析出当前Story的进度信息
+	local curMapId,curLevelId = ManagerContainer.LuaBattleMgr:GetCurMapAndLevel()
+	local mapLevel = curMapId * 10000 + curLevelId
+	local storyCfgV2 = ManagerContainer.CfgMgr:GetStoryCfgV2()
+	local storyTaskCfgV2 = ManagerContainer.CfgMgr:GetStoryTaskCfgV2()
+	local currStoryId = -100
+	local tmpMapLevel = -100
+
+	local keys = {}
+	for k in pairs(storyCfgV2) do
+		if type(k) == "number" then
+			table.insert(keys, k)
+		end
+	end
+	table.sort(keys)
+	for _, k in ipairs(keys) do
+		local v = storyCfgV2[k]
+		if mapLevel > v.MapLevel and v.MapLevel > tmpMapLevel then
+			currStoryId = v.StoryId
+			tmpMapLevel = v.MapLevel
+		end
+	end
+	
+	local currTaskId = 0
+	for k, v in pairs(storyTaskCfgV2) do
+		if v.StoryId == currStoryId then
+			currTaskId = v.Id
+		end
+	end
+	local next1TaskId = currTaskId + 1
+	local next2TaskId = currTaskId + 2
+	local next1StoryId = storyTaskCfgV2[next1TaskId].StoryId
+	local next2StoryId = storyTaskCfgV2[next2TaskId].StoryId
+	LogError(string.format("mapLevel=%s currTaskId=%s currStoryId=%s next1StoryId=%s next2StoryId=%s", mapLevel, currTaskId, currStoryId, next1StoryId, next2StoryId))
+	local subTasksFinishInfo = {}
+	for k, v in pairs(storyTaskCfgV2[currTaskId].SubTasks) do
+		local t = v[1]
+		local val = v[2]
+		local isFinish = false
+		local txt = ""
+		if t == 1 then
+			if mapLevel > val then
+				isFinish = true
+			end
+			local levelData = ManagerContainer.CfgMgr:GetLevelDataById(val)
+			local bossId = levelData.BossId
+			local npcId = math.floor(bossId/1000)
+			local npcData = ManagerContainer.CfgMgr:GetNpcCfgById(npcId)
+			txt = string.format("击败BOSS【%s】", npcData["Name"])
+		elseif t == 2 then
+			local climbingTowerLv = ManagerContainer.DataMgr.TowerDataMgr:GetCurChallengeLevel()
+			if climbingTowerLv > val then
+				isFinish = true
+			end
+		elseif t == 3 then
+			local curLv = ManagerContainer.DataMgr.UserData:GetRoleLv()
+			if curLv > val then
+				isFinish = true
+			end
+		end
+		
+		table.insert(subTasksFinishInfo, {type=t, txt=txt, isFinish=isFinish})
+	end
+	local currTaskShowData = {
+		title = storyCfgV2[currStoryId].StoryTitle,
+		subTasksFinishInfo = subTasksFinishInfo
+	}
+	local next1TaskShowData = {
+		title = storyCfgV2[next1StoryId].StoryTitle,
+		subTasksFinishInfo = {}
+	}
+	local next2TaskShowData = {
+		title = storyCfgV2[next2StoryId].StoryTitle,
+		subTasksFinishInfo = {}
+	}
+	self.currentTask.taskName.text.text = I18N.T(currTaskShowData.title)
+	for i = 1, 5 do
+		if i <= #currTaskShowData.subTasksFinishInfo then
+			local finishInfo = currTaskShowData.subTasksFinishInfo[i]
+			self.currentTask.taskFinishInfo["taskStep"..i]:SetActive(true)
+			self.currentTask.taskFinishInfo["taskStep"..i].finishIcon:SetActive(finishInfo.isFinish)
+			self.currentTask.taskFinishInfo["taskStep"..i].unfinishIcon:SetActive(finishInfo.isFinish == false)
+			self.currentTask.taskFinishInfo["taskStep"..i].stepText.text.text = finishInfo.txt
+		else
+			self.currentTask.taskFinishInfo["taskStep"..i]:SetActive(false)
+		end
+	end
+	self.nextTask1.taskName.text.text = I18N.T(next1TaskShowData.title)
+	self.nextTask2.taskName.text.text = I18N.T(next2TaskShowData.title)
+end
+
 ------------------在线奖励
 --刷新时间
 function UIBattleView:RefreshOnlineTime()
@@ -498,6 +594,8 @@ function UIBattleView:OnShow()
 
 	if not ManagerContainer.LuaBattleMgr:GetBossFightState() then
 		self.MapRootGo:SetActive(true)
+		self.taskInfo:SetActive(true)
+		self:RefreshStoryTaskInfo()
 	end
 	self:RefreshOnlineRecordBtn()
 
@@ -972,6 +1070,7 @@ function UIBattleView:SetBossBattleInfo()
 	self.MapRootGo:SetActive(false)
 	self.btnwarlog:SetActive(false)
 	self.btnStatistics:SetActive(false)
+	self.taskInfo:SetActive(false)
 	self:RefreshRedEnvelope()
 
 	ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.BOSS_BATTLE_STATUS, true)
@@ -1124,6 +1223,8 @@ function UIBattleView:ShowBattleNormalUI1()
 	--self.ProfitBoxGo:SetActive(true)
 	if not ManagerContainer.LuaBattleMgr:GetBossFightState() then
 		self.MapRootGo:SetActive(true)
+		self.taskInfo:SetActive(true)
+		self:RefreshStoryTaskInfo()
 	end
 
 	-- 隐藏不需要按钮
@@ -1247,6 +1348,7 @@ function UIBattleView:OnCloseNewOpen()
 	if newForceId then
 		ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.UI_FORCE_GUIDE_TRIGGER, Enum.ForceGuideTriggerEnum.FuncOpen,
 			newForceId)
+		LogError("UIBattleView:OnCloseNewOpen UI_FORCE_GUIDE_TRIGGER "..newForceId)
 		self.controller:SetNewForceId()
 	else
 		ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.UI_FORCE_GUIDE_OVER, true)

Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua

@@ -812,19 +812,18 @@ function UILiveRoomView:RefreshStageTimer(timerVal)
 	local data = ManagerContainer.DataMgr.LiveRoomData:GetData()
 	local stage = data["stage"]
 	local itemLua = self:GetCurrPageLua()
+	local name
 	if stage == LIVEROOM_STAGE_IDLE then
-		itemLua.idlePad.timer.text.text = tostring(timerVal)
-		itemLua.idlePad.timer:SetActive(timerVal > 0)
+		name="等待中"
 	elseif stage == LIVEROOM_STAGE_READY then
-		itemLua.readyPad.timer.text.text = tostring(timerVal)
-		itemLua.readyPad.timer:SetActive(timerVal > 0)
+		name="准备中"
 	elseif stage == LIVEROOM_STAGE_SHOW then
-		itemLua.showPad.timer.text.text = tostring(timerVal)
-		itemLua.showPad.timer:SetActive(timerVal > 0)
+		name="进行中"
 	elseif stage == LIVEROOM_STAGE_RESULT then
-		itemLua.resultPad.timer.text.text = tostring(timerVal)
-		itemLua.resultPad.timer:SetActive(timerVal > 0)
+		name="结算中"
 	end
+	itemLua.timer.text_name.text.text = name
+	itemLua.timer.text_time.text.text = tostring(timerVal)
 end
 
 --endregion 计时器相关

Assets/Lua/UI/UIMain/UIMainCtr.lua

@@ -48,17 +48,17 @@ function UIMainCtr:GetAwardTotalTime()
 	return awardTotalTime
 end
 
-function UIMainCtr:GetCurrAndNextTaskCfgs()
-	local curLevelId = ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId()
-	local currTaskCfgs, nextTaskCfgs = ManagerContainer.CfgMgr:GetTaskCfgV2ByMapLv(curLevelId)
-	local currTaskCfg
-	for k, v in pairs(currTaskCfgs) do
-		if v['MapLv'] == curLevelId then
-			currTaskCfg = v['MapLv']
-		end
-	end
-	return currTaskCfgs,nextTaskCfgs,currTaskCfg
-end
+-- function UIMainCtr:GetCurrAndNextTaskCfgs()
+-- 	local curLevelId = ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId()
+-- 	local currTaskCfgs, nextTaskCfgs = ManagerContainer.CfgMgr:GetTaskCfgV2ByMapLv(curLevelId)
+-- 	local currTaskCfg
+-- 	for k, v in pairs(currTaskCfgs) do
+-- 		if v['MapLv'] == curLevelId then
+-- 			currTaskCfg = v['MapLv']
+-- 		end
+-- 	end
+-- 	return currTaskCfgs,nextTaskCfgs,currTaskCfg
+-- end
 
 -- function UIMainCtr:IsPlayKillSmallMonsterStoryId()
 -- 	if ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId() > 10001 then

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -389,7 +389,7 @@ function UIMainView:OnLevelChanged()
 end
 
 function UIMainView:RefreshTaskInfo()
-	local currTaskCfgs,nextTaskCfgs,currTaskCfg = self.controller:GetCurrAndNextTaskCfgs()
+	--local currTaskCfgs,nextTaskCfgs,currTaskCfg = self.controller:GetCurrAndNextTaskCfgs()
 end
 
 function UIMainView:RefreshLockInfo()
@@ -791,7 +791,7 @@ end
 
 function UIMainView:OnFruitBtn()
 	ManagerContainer.LuaGameMgr:EnterBattle(false)
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIFruit)	
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom)	
 end
 
 function UIMainView:OnChallengeBossBtn()
@@ -941,7 +941,7 @@ function UIMainView:ChangePageMsg(pageType, data)
 		ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIChat, {openMode="chat"})
 	elseif pageType == Enum.MainViewPageType.Fruit then
 		ManagerContainer.LuaGameMgr:EnterBattle(false);
-		ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIFruit, data)
+		ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom, data)
 	elseif pageType == Enum.MainViewPageType.XiuLian then
 		ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIGoddess, nil, self.uiData.id)
 	elseif pageType == Enum.MainViewPageType.Rank then

Assets/Lua/UI/UIPlayStory/UIPlayStoryCtr.lua

@@ -11,7 +11,7 @@ function UIPlayStoryCtr:SetData(data)
 
 	local storyData = self.data
 	local storyId = storyData.StoryId
-	local storyIntro = storyData.StoryIntro
+	local storyIntro = storyData.StoryIntro or {}
 	local storyPerforms = ManagerContainer.CfgMgr:GetStoryPerformDataById(storyId)
 	
 	local cfgs = {}

ProtocolGen/proto/ProtoMsgId.lua

@@ -724,6 +724,26 @@
 	SC_FRUIT_CHAT_NTF                = 1767,		--	SCFruitChatNtf **SCFruitChatNtf **login.proto **game,fruit [SCFruitChatNtf]
 	CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ = 1768,		--	领取送NPC物品的奖励 **CSRoleGetSendNpcItemRewardReq **login.proto **game [CSRoleGetSendNpcItemRewardReq]
 	SC_ROLE_GET_SEND_NPC_ITEM_REWARD_ACK = 1769,		--	SCRoleGetSendNpcItemRewardAck **SCRoleGetSendNpcItemRewardAck **login.proto ** [SCRoleGetSendNpcItemRewardAck]
+	CS_LIVE_ROOM_JOIN_REQ            = 1770,		--	CSLiveRoomJoinReq **CSLiveRoomJoinReq **login.proto **game,fruit [CSLiveRoomJoinReq]
+	SC_LIVE_ROOM_JOIN_ACK            = 1771,		--	SCLiveRoomJoinAck **SCLiveRoomJoinAck **login.proto **game,fruit [SCLiveRoomJoinAck]
+	CS_LIVE_ROOM_LEAVE_REQ           = 1772,		--	CSLiveRoomLeaveReq **CSLiveRoomLeaveReq **login.proto **game,fruit [CSLiveRoomLeaveReq]
+	SC_LIVE_ROOM_LEAVE_ACK           = 1773,		--	SCLiveRoomLeaveAck **SCLiveRoomLeaveAck **login.proto **game,fruit [SCLiveRoomLeaveAck]
+	CS_LIVE_ROOM_CHAT_REQ            = 1774,		--	CSLiveRoomChatReq **CSLiveRoomChatReq **login.proto **game,fruit [CSLiveRoomChatReq]
+	SC_LIVE_ROOM_CHAT_NTF            = 1775,		--	SCLiveRoomChatNtf **SCLiveRoomChatNtf **login.proto **game,fruit [SCLiveRoomChatNtf]
+	SC_LIVE_ROOM_TIMER_NTF           = 1776,		--	SCLiveRoomTimerNtf **SCLiveRoomTimerNtf **login.proto **game,fruit [SCLiveRoomTimerNtf]
+	CS_LIVE_ROOM_SEND_GIFT_REQ       = 1777,		--	CSLiveRoomSendGiftReq **CSLiveRoomSendGiftReq **login.proto **game,fruit [CSLiveRoomSendGiftReq]
+	SC_LIVE_ROOM_SEND_GIFT_ACK       = 1778,		--	SCLiveRoomSendGiftAck **SCLiveRoomSendGiftAck **login.proto **game,fruit [SCLiveRoomSendGiftAck]
+	SC_LIVE_ROOM_GIFT_RANK_NTF       = 1779,		--	SCLiveRoomGiftRankNtf **SCLiveRoomGiftRankNtf **login.proto **game,fruit [SCLiveRoomGiftRankNtf]
+	CS_LIVE_ROOM_GET_READY_REQ       = 1783,		--	CSLiveRoomGetReadyReq **CSLiveRoomGetReadyReq **login.proto **game,fruit [CSLiveRoomGetReadyReq]
+	SC_LIVE_ROOM_GET_READY_ACK       = 1784,		--	SCLiveRoomGetReadyAck **SCLiveRoomGetReadyAck **login.proto **game,fruit [SCLiveRoomGetReadyAck]
+	SC_LIVE_ROOM_GET_READY_NTF       = 1785,		--	SCLiveRoomGetReadyNtf **SCLiveRoomGetReadyNtf **login.proto **game,fruit [SCLiveRoomGetReadyNtf]
+	SC_LIVE_ROOM_STAGE_NTF           = 1789,		--	SCLiveRoomStageNtf **SCLiveRoomStageNtf **login.proto **game,fruit [SCLiveRoomStageNtf]
+	SC_LIVE_ROOM_CMD_TALK_NTF        = 1794,		--	SCLiveRoomCMDTalkNtf **SCLiveRoomCMDTalkNtf **login.proto **game,fruit [SCLiveRoomCMDTalkNtf]
+	SC_LIVE_ROOM_CMD_PLAY_NTF        = 1795,		--	SCLiveRoomCMDPlayNtf **SCLiveRoomCMDPlayNtf **login.proto **game,fruit [SCLiveRoomCMDPlayNtf]
+	CS_LIVE_ROOM_SHOW_SUBMIT_REQ     = 1796,		--	CSLiveRoomShowSubmitReq **CSLiveRoomShowSubmitReq **login.proto **game,fruit [CSLiveRoomShowSubmitReq]
+	SC_LIVE_ROOM_SHOW_SUBMIT_ACK     = 1797,		--	SCLiveRoomShowSubmitAck **SCLiveRoomShowSubmitAck **login.proto **game,fruit [SCLiveRoomShowSubmitAck]
+	SC_LIVE_ROOM_SHOW_DATA_NTF       = 1798,		--	SCLiveRoomShowDataNtf **SCLiveRoomShowDataNtf **login.proto **game,fruit [SCLiveRoomShowDataNtf]
+	SC_LIVE_ROOM_RESULT_NTF          = 1799,		--	SCLiveRoomResultNtf **SCLiveRoomResultNtf **login.proto **game,fruit [SCLiveRoomResultNtf]
 
     }
     return ProtoMsgId

ProtocolGen/proto/common.proto

@@ -61,6 +61,7 @@ enum ResType {
     Res_IdolSeason                  = 50; //偶像季
     Res_WishBox                     = 51; //许愿宝箱
     Res_WishBox_Select              = 52; //许愿自选宝箱
+    Res_Game_Chip                   = 51000; //游戏币，用于购买直播打赏礼物
 }
 
 //Count表示N次操作，Num表示目标个数 [枚举:目标:条件]

ProtocolGen/proto/error_code.proto

@@ -510,4 +510,6 @@ enum ErrorCode {
 
     ERROR_FRUIT_CHIP_INSUFFICIENT = 4000; // 筹码不足
     ERROR_FRUIT_CURR_STAGE_CANNOT_BET = 4001; // 当前阶段不能押注
+    
+    ERROR_LIVEROOM_NOT_FIND_ROOM = 5000;
 }

ProtocolGen/proto/login.proto

@@ -1457,6 +1457,7 @@ message CSRoleGetSendNpcItemRewardReq {   //project game  //RouteRule game
     uint64  item_id = 1;
     uint32  item_num = 2;
     int32   reward_id = 3;
+    string  reward_param = 4;
 }
 message SCRoleGetSendNpcItemRewardAck {
     int32   error             = 1;  //错误码
@@ -3871,3 +3872,118 @@ message SCFruitChatNtf { //project game|fruit  //RouteRule game
     string head_id = 5;
     string chat_content = 6;
 }
+
+message CSLiveRoomJoinReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_type = 2;
+    uint32 coin_num = 3;
+    uint32 game_chip_num = 4;
+    LiveRoomPlayerInfo player_info = 5;
+}
+message SCLiveRoomJoinAck { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    int32 error = 2;
+    uint32 room_type = 3;
+    uint32 room_id = 4;
+    uint32 stage = 5;
+    uint32 stage_timer_sec = 6;
+    uint32 stage_sec = 7;
+    bool is_ready = 8;
+    repeated LiveRoomPlayerInfo gift_rank = 9;
+    repeated LiveRoomChatData chat_datas = 10;
+    repeated LiveRoomPlayerInfo ready_player_info_list = 11;
+}
+message CSLiveRoomLeaveReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+}
+message SCLiveRoomLeaveAck { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    int32 error = 2;
+    uint32 room_id = 3;
+}
+message CSLiveRoomChatReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    string chat_content = 3;
+}
+message SCLiveRoomChatNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    LiveRoomChatData chat_data = 3;
+}
+message SCLiveRoomTimerNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    uint32 stage = 3;
+    uint32 timer_sec = 4;
+}
+message CSLiveRoomSendGiftReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    uint32 gift_id = 3;
+}
+message SCLiveRoomSendGiftAck { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    int32 error = 2;
+    uint32 room_id = 3;
+    uint32 gift_id = 4;
+}
+message SCLiveRoomGiftRankNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    repeated LiveRoomPlayerInfo gift_rank = 2;
+}
+message SCLiveRoomCMDTalkNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    uint32 talk_id = 3;
+    string talk_params = 4;
+}
+message SCLiveRoomCMDPlayNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    repeated KeyValueType64 play_data_list = 3;
+}
+message SCLiveRoomStageNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    uint32 stage = 3;
+    uint32 stage_timer_sec = 4;
+    string stage_params = 5;
+}
+message CSLiveRoomGetReadyReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+}
+message SCLiveRoomGetReadyAck { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    int32 error = 2;
+    bool is_ready = 3;
+}
+message SCLiveRoomGetReadyNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    repeated LiveRoomPlayerInfo ready_player_info_list = 3;
+}
+message SCLiveRoomShowDataNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    repeated KeyValueType64 show_data_list = 3;
+}
+message CSLiveRoomShowSubmitReq { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    repeated KeyValueType64 submit_data = 3;
+}
+message SCLiveRoomShowSubmitAck { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    int32 error = 2;
+    repeated KeyValueType64 submit_result = 3;
+}
+
+message SCLiveRoomResultNtf { //project game|fruit  //RouteRule game
+    uint64 uid = 1;
+    uint32 room_id = 2;
+    repeated LiveRoomPlayerInfo player_result_list = 3;
+    repeated KeyValueType64 player_reward_list = 4;
+}

ProtocolGen/proto/messagedef.proto

@@ -749,6 +749,26 @@ enum protoMsgId{
 	SC_FRUIT_CHAT_NTF                = 1767;		//	SCFruitChatNtf **SCFruitChatNtf **login.proto **game,fruit [SCFruitChatNtf]
 	CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ = 1768;		//	领取送NPC物品的奖励 **CSRoleGetSendNpcItemRewardReq **login.proto **game [CSRoleGetSendNpcItemRewardReq]
 	SC_ROLE_GET_SEND_NPC_ITEM_REWARD_ACK = 1769;		//	SCRoleGetSendNpcItemRewardAck **SCRoleGetSendNpcItemRewardAck **login.proto ** [SCRoleGetSendNpcItemRewardAck]
+	CS_LIVE_ROOM_JOIN_REQ            = 1770;		//	CSLiveRoomJoinReq **CSLiveRoomJoinReq **login.proto **game,fruit [CSLiveRoomJoinReq]
+	SC_LIVE_ROOM_JOIN_ACK            = 1771;		//	SCLiveRoomJoinAck **SCLiveRoomJoinAck **login.proto **game,fruit [SCLiveRoomJoinAck]
+	CS_LIVE_ROOM_LEAVE_REQ           = 1772;		//	CSLiveRoomLeaveReq **CSLiveRoomLeaveReq **login.proto **game,fruit [CSLiveRoomLeaveReq]
+	SC_LIVE_ROOM_LEAVE_ACK           = 1773;		//	SCLiveRoomLeaveAck **SCLiveRoomLeaveAck **login.proto **game,fruit [SCLiveRoomLeaveAck]
+	CS_LIVE_ROOM_CHAT_REQ            = 1774;		//	CSLiveRoomChatReq **CSLiveRoomChatReq **login.proto **game,fruit [CSLiveRoomChatReq]
+	SC_LIVE_ROOM_CHAT_NTF            = 1775;		//	SCLiveRoomChatNtf **SCLiveRoomChatNtf **login.proto **game,fruit [SCLiveRoomChatNtf]
+	SC_LIVE_ROOM_TIMER_NTF           = 1776;		//	SCLiveRoomTimerNtf **SCLiveRoomTimerNtf **login.proto **game,fruit [SCLiveRoomTimerNtf]
+	CS_LIVE_ROOM_SEND_GIFT_REQ       = 1777;		//	CSLiveRoomSendGiftReq **CSLiveRoomSendGiftReq **login.proto **game,fruit [CSLiveRoomSendGiftReq]
+	SC_LIVE_ROOM_SEND_GIFT_ACK       = 1778;		//	SCLiveRoomSendGiftAck **SCLiveRoomSendGiftAck **login.proto **game,fruit [SCLiveRoomSendGiftAck]
+	SC_LIVE_ROOM_GIFT_RANK_NTF       = 1779;		//	SCLiveRoomGiftRankNtf **SCLiveRoomGiftRankNtf **login.proto **game,fruit [SCLiveRoomGiftRankNtf]
+	CS_LIVE_ROOM_GET_READY_REQ       = 1783;		//	CSLiveRoomGetReadyReq **CSLiveRoomGetReadyReq **login.proto **game,fruit [CSLiveRoomGetReadyReq]
+	SC_LIVE_ROOM_GET_READY_ACK       = 1784;		//	SCLiveRoomGetReadyAck **SCLiveRoomGetReadyAck **login.proto **game,fruit [SCLiveRoomGetReadyAck]
+	SC_LIVE_ROOM_GET_READY_NTF       = 1785;		//	SCLiveRoomGetReadyNtf **SCLiveRoomGetReadyNtf **login.proto **game,fruit [SCLiveRoomGetReadyNtf]
+	SC_LIVE_ROOM_STAGE_NTF           = 1789;		//	SCLiveRoomStageNtf **SCLiveRoomStageNtf **login.proto **game,fruit [SCLiveRoomStageNtf]
+	SC_LIVE_ROOM_CMD_TALK_NTF        = 1794;		//	SCLiveRoomCMDTalkNtf **SCLiveRoomCMDTalkNtf **login.proto **game,fruit [SCLiveRoomCMDTalkNtf]
+	SC_LIVE_ROOM_CMD_PLAY_NTF        = 1795;		//	SCLiveRoomCMDPlayNtf **SCLiveRoomCMDPlayNtf **login.proto **game,fruit [SCLiveRoomCMDPlayNtf]
+	CS_LIVE_ROOM_SHOW_SUBMIT_REQ     = 1796;		//	CSLiveRoomShowSubmitReq **CSLiveRoomShowSubmitReq **login.proto **game,fruit [CSLiveRoomShowSubmitReq]
+	SC_LIVE_ROOM_SHOW_SUBMIT_ACK     = 1797;		//	SCLiveRoomShowSubmitAck **SCLiveRoomShowSubmitAck **login.proto **game,fruit [SCLiveRoomShowSubmitAck]
+	SC_LIVE_ROOM_SHOW_DATA_NTF       = 1798;		//	SCLiveRoomShowDataNtf **SCLiveRoomShowDataNtf **login.proto **game,fruit [SCLiveRoomShowDataNtf]
+	SC_LIVE_ROOM_RESULT_NTF          = 1799;		//	SCLiveRoomResultNtf **SCLiveRoomResultNtf **login.proto **game,fruit [SCLiveRoomResultNtf]
 	SS_WEB_GM_CHAT_MSG_NTF           = 3000;		//	SSWebGMChatMsgNtf **SSWebGMChatMsgNtf **logic.proto **db [SSWebGMChatMsgNtf]
 	SS_WEB_GM_ADD_MAIL_NTF           = 3001;		//	SSWebGMAddMailNtf **SSWebGMAddMailNtf **logic.proto **social,game,db [SSWebGMAddMailNtf]
 	SS_WEB_GM_BAN_NTF                = 3002;		//	SSWebGMBanNtf **SSWebGMBanNtf **logic.proto **social,game [SSWebGMBanNtf]
@@ -878,6 +898,10 @@ enum protoMsgId{
 	SS_COMPETITION_GET_PLAYER_VOTE_RANK_ACK = 3127;		//	SSCompetitionGetPlayerVoteRankAck **SSCompetitionGetPlayerVoteRankAck **logic.proto **game [SSCompetitionGetPlayerVoteRankAck]
 	SS_WEB_GM_DEL_ITEM_NTF           = 3128;		//	删除背包内道具(可以根据道具类型做处理) **SSWebGMDelItemNtf **logic.proto **social,game [SSWebGMDelItemNtf]
 	SS_THIRD_PAY_ORDER               = 3129;		//	第三方充值，直接发货 **SSThirdPayOrder **logic.proto **social,game [SSThirdPayOrder]
+	SS_GAME_ROLE_ADD_ITEM_LIST_REQ   = 3130;		//	角色增加加物品 **SSGameRoleAddItemListReq **logic.proto **game [SSGameRoleAddItemListReq]
+	SS_GAME_ROLE_ADD_ITEM_LIST_ACK   = 3131;		//	SSGameRoleAddItemListAck **SSGameRoleAddItemListAck **logic.proto **fruit [SSGameRoleAddItemListAck]
+	SS_GAME_ROLE_DELETE_ITEM_LIST_REQ = 3132;		//	角色消耗物品 **SSGameRoleDeleteItemListReq **logic.proto **game [SSGameRoleDeleteItemListReq]
+	SS_GAME_ROLE_DELETE_ITEM_LIST_ACK = 3133;		//	SSGameRoleDeleteItemListAck **SSGameRoleDeleteItemListAck **logic.proto **fruit [SSGameRoleDeleteItemListAck]
 	SS_ACCOUNT_GET_ROLE_LIST_REQ     = 5000;		//	获取用户角色信息列表(为以后做多角色列表做准备) **SSAccountGetRoleListReq **db.proto **db [SSAccountGetRoleListReq]
 	SS_ACCOUNT_GET_ROLE_LIST_ACK     = 5001;		//	返回角色列表 **SSAccountGetRoleListAck **db.proto **game [SSAccountGetRoleListAck]
 	SS_ADD_ROLE_BASE_REQ             = 5002;		//	数据库添加玩家信息 **SSAddRoleBaseReq **db.proto **db [SSAddRoleBaseReq]

ProtocolGen/proto/messagedefclient.proto

@@ -727,5 +727,25 @@ enum protoMsgId{
 	SC_FRUIT_CHAT_NTF                = 1767;		//	SCFruitChatNtf **SCFruitChatNtf **login.proto **game,fruit [SCFruitChatNtf]
 	CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ = 1768;		//	领取送NPC物品的奖励 **CSRoleGetSendNpcItemRewardReq **login.proto **game [CSRoleGetSendNpcItemRewardReq]
 	SC_ROLE_GET_SEND_NPC_ITEM_REWARD_ACK = 1769;		//	SCRoleGetSendNpcItemRewardAck **SCRoleGetSendNpcItemRewardAck **login.proto ** [SCRoleGetSendNpcItemRewardAck]
+	CS_LIVE_ROOM_JOIN_REQ            = 1770;		//	CSLiveRoomJoinReq **CSLiveRoomJoinReq **login.proto **game,fruit [CSLiveRoomJoinReq]
+	SC_LIVE_ROOM_JOIN_ACK            = 1771;		//	SCLiveRoomJoinAck **SCLiveRoomJoinAck **login.proto **game,fruit [SCLiveRoomJoinAck]
+	CS_LIVE_ROOM_LEAVE_REQ           = 1772;		//	CSLiveRoomLeaveReq **CSLiveRoomLeaveReq **login.proto **game,fruit [CSLiveRoomLeaveReq]
+	SC_LIVE_ROOM_LEAVE_ACK           = 1773;		//	SCLiveRoomLeaveAck **SCLiveRoomLeaveAck **login.proto **game,fruit [SCLiveRoomLeaveAck]
+	CS_LIVE_ROOM_CHAT_REQ            = 1774;		//	CSLiveRoomChatReq **CSLiveRoomChatReq **login.proto **game,fruit [CSLiveRoomChatReq]
+	SC_LIVE_ROOM_CHAT_NTF            = 1775;		//	SCLiveRoomChatNtf **SCLiveRoomChatNtf **login.proto **game,fruit [SCLiveRoomChatNtf]
+	SC_LIVE_ROOM_TIMER_NTF           = 1776;		//	SCLiveRoomTimerNtf **SCLiveRoomTimerNtf **login.proto **game,fruit [SCLiveRoomTimerNtf]
+	CS_LIVE_ROOM_SEND_GIFT_REQ       = 1777;		//	CSLiveRoomSendGiftReq **CSLiveRoomSendGiftReq **login.proto **game,fruit [CSLiveRoomSendGiftReq]
+	SC_LIVE_ROOM_SEND_GIFT_ACK       = 1778;		//	SCLiveRoomSendGiftAck **SCLiveRoomSendGiftAck **login.proto **game,fruit [SCLiveRoomSendGiftAck]
+	SC_LIVE_ROOM_GIFT_RANK_NTF       = 1779;		//	SCLiveRoomGiftRankNtf **SCLiveRoomGiftRankNtf **login.proto **game,fruit [SCLiveRoomGiftRankNtf]
+	CS_LIVE_ROOM_GET_READY_REQ       = 1783;		//	CSLiveRoomGetReadyReq **CSLiveRoomGetReadyReq **login.proto **game,fruit [CSLiveRoomGetReadyReq]
+	SC_LIVE_ROOM_GET_READY_ACK       = 1784;		//	SCLiveRoomGetReadyAck **SCLiveRoomGetReadyAck **login.proto **game,fruit [SCLiveRoomGetReadyAck]
+	SC_LIVE_ROOM_GET_READY_NTF       = 1785;		//	SCLiveRoomGetReadyNtf **SCLiveRoomGetReadyNtf **login.proto **game,fruit [SCLiveRoomGetReadyNtf]
+	SC_LIVE_ROOM_STAGE_NTF           = 1789;		//	SCLiveRoomStageNtf **SCLiveRoomStageNtf **login.proto **game,fruit [SCLiveRoomStageNtf]
+	SC_LIVE_ROOM_CMD_TALK_NTF        = 1794;		//	SCLiveRoomCMDTalkNtf **SCLiveRoomCMDTalkNtf **login.proto **game,fruit [SCLiveRoomCMDTalkNtf]
+	SC_LIVE_ROOM_CMD_PLAY_NTF        = 1795;		//	SCLiveRoomCMDPlayNtf **SCLiveRoomCMDPlayNtf **login.proto **game,fruit [SCLiveRoomCMDPlayNtf]
+	CS_LIVE_ROOM_SHOW_SUBMIT_REQ     = 1796;		//	CSLiveRoomShowSubmitReq **CSLiveRoomShowSubmitReq **login.proto **game,fruit [CSLiveRoomShowSubmitReq]
+	SC_LIVE_ROOM_SHOW_SUBMIT_ACK     = 1797;		//	SCLiveRoomShowSubmitAck **SCLiveRoomShowSubmitAck **login.proto **game,fruit [SCLiveRoomShowSubmitAck]
+	SC_LIVE_ROOM_SHOW_DATA_NTF       = 1798;		//	SCLiveRoomShowDataNtf **SCLiveRoomShowDataNtf **login.proto **game,fruit [SCLiveRoomShowDataNtf]
+	SC_LIVE_ROOM_RESULT_NTF          = 1799;		//	SCLiveRoomResultNtf **SCLiveRoomResultNtf **login.proto **game,fruit [SCLiveRoomResultNtf]
 
 }

ProtocolGen/proto/protocal.proto

@@ -324,6 +324,12 @@ message Request {
      CSRoleStoryNpcReq         	CS_ROLE_STORY_NPC_REQ                =  1764;         //	剧情NPC好感度 **CSRoleStoryNpcReq **login.proto **game [CSRoleStoryNpcReq]
      CSFruitChatReq         	CS_FRUIT_CHAT_REQ                    =  1766;         //	CSFruitChatReq **CSFruitChatReq **login.proto **game,fruit [CSFruitChatReq]
      CSRoleGetSendNpcItemRewardReq         	CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ     =  1768;         //	领取送NPC物品的奖励 **CSRoleGetSendNpcItemRewardReq **login.proto **game [CSRoleGetSendNpcItemRewardReq]
+     CSLiveRoomJoinReq         	CS_LIVE_ROOM_JOIN_REQ                =  1770;         //	CSLiveRoomJoinReq **CSLiveRoomJoinReq **login.proto **game,fruit [CSLiveRoomJoinReq]
+     CSLiveRoomLeaveReq         	CS_LIVE_ROOM_LEAVE_REQ               =  1772;         //	CSLiveRoomLeaveReq **CSLiveRoomLeaveReq **login.proto **game,fruit [CSLiveRoomLeaveReq]
+     CSLiveRoomChatReq         	CS_LIVE_ROOM_CHAT_REQ                =  1774;         //	CSLiveRoomChatReq **CSLiveRoomChatReq **login.proto **game,fruit [CSLiveRoomChatReq]
+     CSLiveRoomSendGiftReq         	CS_LIVE_ROOM_SEND_GIFT_REQ           =  1777;         //	CSLiveRoomSendGiftReq **CSLiveRoomSendGiftReq **login.proto **game,fruit [CSLiveRoomSendGiftReq]
+     CSLiveRoomGetReadyReq         	CS_LIVE_ROOM_GET_READY_REQ           =  1783;         //	CSLiveRoomGetReadyReq **CSLiveRoomGetReadyReq **login.proto **game,fruit [CSLiveRoomGetReadyReq]
+     CSLiveRoomShowSubmitReq         	CS_LIVE_ROOM_SHOW_SUBMIT_REQ         =  1796;         //	CSLiveRoomShowSubmitReq **CSLiveRoomShowSubmitReq **login.proto **game,fruit [CSLiveRoomShowSubmitReq]
 }
 message Response {
      SCPingAck           	SC_PING_ACK                          =  1001;         //	SCPingAck **SCPingAck **login.proto ** [SCPingAck]
@@ -736,4 +742,18 @@ message Response {
      SCRoleStoryNpcAck           	SC_ROLE_STORY_NPC_ACK                =  1765;         //	SCRoleStoryNpcAck **SCRoleStoryNpcAck **login.proto ** [SCRoleStoryNpcAck]
      SCFruitChatNtf           	SC_FRUIT_CHAT_NTF                    =  1767;         //	SCFruitChatNtf **SCFruitChatNtf **login.proto **game,fruit [SCFruitChatNtf]
      SCRoleGetSendNpcItemRewardAck           	SC_ROLE_GET_SEND_NPC_ITEM_REWARD_ACK     =  1769;         //	SCRoleGetSendNpcItemRewardAck **SCRoleGetSendNpcItemRewardAck **login.proto ** [SCRoleGetSendNpcItemRewardAck]
+     SCLiveRoomJoinAck           	SC_LIVE_ROOM_JOIN_ACK                =  1771;         //	SCLiveRoomJoinAck **SCLiveRoomJoinAck **login.proto **game,fruit [SCLiveRoomJoinAck]
+     SCLiveRoomLeaveAck           	SC_LIVE_ROOM_LEAVE_ACK               =  1773;         //	SCLiveRoomLeaveAck **SCLiveRoomLeaveAck **login.proto **game,fruit [SCLiveRoomLeaveAck]
+     SCLiveRoomChatNtf           	SC_LIVE_ROOM_CHAT_NTF                =  1775;         //	SCLiveRoomChatNtf **SCLiveRoomChatNtf **login.proto **game,fruit [SCLiveRoomChatNtf]
+     SCLiveRoomTimerNtf           	SC_LIVE_ROOM_TIMER_NTF               =  1776;         //	SCLiveRoomTimerNtf **SCLiveRoomTimerNtf **login.proto **game,fruit [SCLiveRoomTimerNtf]
+     SCLiveRoomSendGiftAck           	SC_LIVE_ROOM_SEND_GIFT_ACK           =  1778;         //	SCLiveRoomSendGiftAck **SCLiveRoomSendGiftAck **login.proto **game,fruit [SCLiveRoomSendGiftAck]
+     SCLiveRoomGiftRankNtf           	SC_LIVE_ROOM_GIFT_RANK_NTF           =  1779;         //	SCLiveRoomGiftRankNtf **SCLiveRoomGiftRankNtf **login.proto **game,fruit [SCLiveRoomGiftRankNtf]
+     SCLiveRoomGetReadyAck           	SC_LIVE_ROOM_GET_READY_ACK           =  1784;         //	SCLiveRoomGetReadyAck **SCLiveRoomGetReadyAck **login.proto **game,fruit [SCLiveRoomGetReadyAck]
+     SCLiveRoomGetReadyNtf           	SC_LIVE_ROOM_GET_READY_NTF           =  1785;         //	SCLiveRoomGetReadyNtf **SCLiveRoomGetReadyNtf **login.proto **game,fruit [SCLiveRoomGetReadyNtf]
+     SCLiveRoomStageNtf           	SC_LIVE_ROOM_STAGE_NTF               =  1789;         //	SCLiveRoomStageNtf **SCLiveRoomStageNtf **login.proto **game,fruit [SCLiveRoomStageNtf]
+     SCLiveRoomCMDTalkNtf           	SC_LIVE_ROOM_CMD_TALK_NTF            =  1794;         //	SCLiveRoomCMDTalkNtf **SCLiveRoomCMDTalkNtf **login.proto **game,fruit [SCLiveRoomCMDTalkNtf]
+     SCLiveRoomCMDPlayNtf           	SC_LIVE_ROOM_CMD_PLAY_NTF            =  1795;         //	SCLiveRoomCMDPlayNtf **SCLiveRoomCMDPlayNtf **login.proto **game,fruit [SCLiveRoomCMDPlayNtf]
+     SCLiveRoomShowSubmitAck           	SC_LIVE_ROOM_SHOW_SUBMIT_ACK         =  1797;         //	SCLiveRoomShowSubmitAck **SCLiveRoomShowSubmitAck **login.proto **game,fruit [SCLiveRoomShowSubmitAck]
+     SCLiveRoomShowDataNtf           	SC_LIVE_ROOM_SHOW_DATA_NTF           =  1798;         //	SCLiveRoomShowDataNtf **SCLiveRoomShowDataNtf **login.proto **game,fruit [SCLiveRoomShowDataNtf]
+     SCLiveRoomResultNtf           	SC_LIVE_ROOM_RESULT_NTF              =  1799;         //	SCLiveRoomResultNtf **SCLiveRoomResultNtf **login.proto **game,fruit [SCLiveRoomResultNtf]
 }

ProtocolGen/proto/user.proto

@@ -2046,3 +2046,18 @@ message FruitPlayerAwardInfo {
     int32 award_chip_num = 5;
     int32 rank = 6;
 }
+
+message LiveRoomPlayerInfo {
+    uint64 uid = 1;
+    string nickname = 2;
+    uint32 level = 3;
+    string head_id = 4;
+    uint32 head_title = 5;
+    string data = 6;
+}
+
+message LiveRoomChatData {
+    uint64 SN = 1;
+    LiveRoomPlayerInfo player_info = 2;
+    string chat_content = 3;
+}