diff --git a/Assets/Font/Assets/ChillBitmap_16px SDF.asset b/Assets/Font/Assets/ChillBitmap_16px SDF.asset index 1fa2d80f5..96c5ebe5e 100644 --- a/Assets/Font/Assets/ChillBitmap_16px SDF.asset +++ b/Assets/Font/Assets/ChillBitmap_16px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cc831703ce1d3ac169559520f9764cd359016636955606db0578259bb7b78e4 -size 18720627 +oid sha256:fe2a40b3de3d36e7f9d10a5bc7d494f3b5b6250447ba19843b9d0f722579c43a +size 18724862 diff --git a/Assets/Font/Assets/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Font/Assets/WenQuanYi Bitmap Song 14px SDF.asset index 003a7c497..12aef88a7 100644 --- a/Assets/Font/Assets/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Font/Assets/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9d9b5d4919d9dd921670992e60fae157951c9b502bfea28e8df7713d7eb97ac -size 10280552 +oid sha256:46c2bed849979ea2cf032804bfbd451023934cb1e2b8afb3627ad865bbe7ec9a +size 10280884 diff --git a/Assets/Font/字符统计.txt b/Assets/Font/字符统计.txt index 328c9baed..0af1befac 100644 --- a/Assets/Font/字符统计.txt +++ b/Assets/Font/字符统计.txt @@ -29,183 +29,183 @@ rstuvwxyz{|}~̀́̂̃̄̅̆ 倾假偉偎偏做停健側偶偷偽偿傅傍備储催傲傷 傻働像僚僧僵僻儒償優儿允元兄充兆先光克免 兑兔党兜兢入全八公六兮兰共关兴兵其具典兹 -养兼兽冀内円冈冉册再冒冗写军农冠冤冥冬冯 -冰冲决况冶冷冻冽净凄准凉凋凌减凑凛凝几凡 -凤処凭凯凰凳凶凸凹出击函凿刀刁刃分切刊刑 -划列刘则刚创初删判別刨利别刮到制刷券刹刺 -刻剂剃則削前剑剔剖剤剥剧剩剪副割剿劈力劝 -办功加务劣动助努劫励劲劳効势勃勇勉勋勒動 -勘募勢勤勧勺勾勿匀匂包匆匈匕化北匙匠匣匪 -匹区医匾匿十千升午卉半华协卑卒卓協单卖南 -単博卜占卡卢卤卦卧卫卯印危即却卵卷卸卿厂 -厄厅历厉压厌厕厘厚原厢厦厨厳去县叁参又叉 -及友双反収发叔取受变叙叛叠口古句另叨叩只 -叫召叭叮可台叱史右叶号司叹叼叽吁吃各吆合 -吉吊同名后吏吐向吓吕吗君吝吞吟吠否吧吨吩 -含听吭吮启吱吴吵吸吹吻吼吾呀呃呆呈告呐呑 -呕员呛呜呟呢周味呵呸呻呼命咄咆咋和咏咐咒 -咔咕咖咙咚咦咧咨咪咬咯咱咳咸咽哀品哄哆哇 -哈哉响哎哑哒哗哟哥哦哨哩哪哭哮哲哺哼唁唆 -唇唉唐唠唤唧唬售唯唱唾啃啄商啊問啡啤啥啦 -啧啪啰啸啼喂善喇喉喊喔喘喜喝喧喩喳喷喻嗅 -嗓嗜嗡嗦嗨嗯嗷嗽嘀嘈嘉嘘嘛嘞嘱嘲嘴嘶嘹嘻 -嘿噂噢器噩噪噬嚎嚣嚷嚼囊囚四回因团囤园困 -囱囲围固国图圃圆圈土圣圧在地场圾址均坊坎 -坏坐坑块坚坛坝坟坠坡坤坦坪坯坷垂垃垄型垒 -垛垢垦垫垮埂埃埋城域埠執培基堂堆堕堡堤堪 -堰報場堵塌塑塔塗塘塞塩填境墅墓墙增墟墨墩 -壁壊壤士壬壮声壳壶壹处备変复夏夕外多夜够 -夢大天太夫夭央夯失头夷夸夹夺奇奈奉奋奏契 -奔奖套奠奢奥女奴奶奸她好如妃妄妆妇妈妒妓 -妖妙妥妨妮妹妻姆姉姊始姐姑姓委姚姜姥姨姻 -姿威娃娄娇娘娜娟娥娱娶婆婉婚婪婴婶婿媒媚 -媳嫁嫂嫉嫌嫩嬉子孔孕字存孙孝孟季孤学孩孵 -孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝实実 -宠审客宣室宦宪宫宰害宴宵家容宽宾宿寂寄寅 -密寇富寒寓寝寞察寡寥寨審寸对寺寻导対寿封 -専射将尉尊小少尔尖尘尚尝尤尧尬就尴尸尺尼 -尽尾尿局屁层居屈屉届屋屎屏屑展属屠屡層履 -屯山屹屿岁岂岔岖岗岛岩岭岳岸峡峦峨峭峰峻 -崇崎崔崖崛崩崭嵌巅巍川州巡巢巣工左巧巨巩 -巫差己已巳巴巷巾币市布帅帆师希帐帕帖帘帚 -帜帝带帧席帮帯帰帷常帽幅幌幕幢干平年并幸 -幻幼幽幾广広庄庆庇床序庐库应底店庙庚府庞 -废度座庭庵庶康庸廉廊廓延廷建开异弃弄弊式 -弓引弗弘弛弟张弥弦弧弯弱張強弹强归当录形 -彤彩彪彬彭彰影役彻彼往征径待很徊律後徐徒 -従得徘徙御復循微德徹徽心必忆忌忍志忘忙忠 -忧快忱念忽忿怀态怎怒怔怕怖怜思怠怡急性怨 -怪怯总恃恋恍恐恒恕恙恢恤恥恨恩恬恭息恰恳 -恶恼悄悉悍悔悖悟悠患悦您悩悪悬悯悲悴悼情 -惊惋惑惕惜惟惠惦惧惨惩惫惭惯惰想惶惹愁愈 -愉意愕愚愛感愣愤愧愿慈態慌慎慕慢慣慧慨慰 -慷憋憎憔憨憶憾懂懈懊懐懒懦戈戊戌戎戏成我 -戒或战戚截戳戴户戻房所扁扇扉手才扎扑扒打 -扔托扛扣执扩扫扬扭扮扯扰扳扶批扼找承技抄 -把抑抒抓投抖抗折抚抛抜択抠抡抢护报披抬抱 -抵抹押抽抿拂拄担拆拇拉拌拍拎拐拒拓拔拖拗 -拘拙招拜拟拡拢拣拥拦拧拨择括拭拯拱拳拴拷 -拼拽拾拿持挂指按挎挑挖挚挟挠挡挣挤挥挨挪 -挫振挺挽捂捅捆捉捋捌捍捎捏捐捕捜捞损捡换 -捣捧据捶捷捺捻掀掂授掉掌掏掐排掘掠探接控 -推掩措掰掷掺揉揍描提插換握揣揩揪揭援揺揽 -搀搁搂搅損搏搓搔搜搞搬搭携摄摆摇摊摔摘摧 -摩摸摹撇撑撒撕撞撤撩撬播撮撰撵撸撼擂擅操 -擎擒擦攀攒攥支收改攻放政故效敌敏救敗教敛 -敞敢散敦敬数敲整敵敷文斋斌斑斗料斜斟斤斥 -斧斩断斯新方施旁旅旋族旗无既日旦旧旨早旬 -旭旱时旷旺昂昆昌明昏易昔星映春昧昨昭是昼 -显時晃晋晌晒晓晕晚晦晨晩普景晰晴晶智晾暂 -暇暑暖暗暮暴曙曝曰曲更書曹曼曾替最月有朋 -服朔朗望朝期朦木未末本术朱朴朵机朽杀杂权 -杆杉李杏材村杖杜束杠条来杨杭杯杰東松板极 -构枉析枕林枚果枝枠枢枣枪枫枯架柄柏某柑柒 -染柔柜柠查柬柱柳柴査柿栅标栈栋栏树栓栖栗 -校株样核根格栽桂桃框案桌桐桑桔档桥桦桨桩 -桶梁梅梆梗梢梦梧梨梭梯械梳检棉棋棍棒棕棘 -棚棠森棱棵棺椅植椎椒検椭椰椿楚業楷楼楽概 -榄榆榔榕榜榨榴構槐様槛槽標樟模権横樱橄橘 -橙機橡橱檀檐檬欠次欢欣欧欲欺款歇歉歌止正 -此步武歧歩歪歹死歼殃殉殊残殖殴段殷殺殿毁 -毅母毎每毒比毕毙毛毡毫毯氏民氓气気氛氢氧 -氨氮氯水永汁求汇汉汐汗汚汛汝汞江池污汤汪 -汰汹決汽沁沃沈沉沐沙沛沟没沢沥沦沧沪沫沮 -河沸油治沼沽沾沿況泄泉泊泌法泛泞泡波泣泥 -注泪泰泳泵泻泼泽洁洋洒洗洛洞津洩洪洲活洼 -洽派流浅浆浇浊测济浏浑浓浙浦浩浪浮浴海浸 -涂消涉涌涕涛涝涡涣涤润涧涨涩涮涯液涵淀淆 -淋淌淑淘淡淤淫淮深淳混淹添清済渉渊渐渔渗 -渝渠渡渣渤温港渲渴游渺湃湖湘湾湿溃溅溉源 -準溜溢溪溯溶溺滇滋滑滔滚滞满滤滥滨滩滴漂 -漆漏漓演漠漫漱漾潇潘潜潤潭潮澄澈澎澜澡澳 -激濒瀑灌火灭灯灰灵灶灸灼灾灿炉炊炎炒炕炫 -炬炭炮炸点炼烁烂烈烘烙烛烟烤烦烧烫热烹焉 -焊焕焚無焦焰然焼煌煎煙煞煤照煩煮煽熄熊熏 -熔熙熟熬熱燃燕燥爆爪爬爱爵父爷爸爹爽片版 -牌牙牛牡牢牧物牲牵特牺犀犁犬犯状犹狂狈狐 -狗狞狠狡独狭狮狰狱狸狼猎猖猛猜猩猪猫猬献 -猴猾猿玄率玉王玖玛玩玫环现玲玷玻珊珍珠班 -現球琅理琉琐琢琳琴琼瑙瑞瑟瑰璃璧環瓜瓢瓣 -瓤瓦瓶瓷甘甚甜生産甥用甩甫田由甲申电男甸 -町画畅界畏畔留畜略番異畴畸疆疏疑疗疙疚疟 -疤疫疮疯疲疹疼疾病症痊痒痕痘痛痢痪痰痴痹 -瘟瘤瘦瘩瘪瘫瘸瘾療癌癣癸発登白百皂的皆皇 -皓皖皮皱皺皿盆盈益盏盐监盒盔盖盗盘盛盟目 -盯盲直相盹盼盾省眉看真眠眨眩眯眶眷眺眼着 -睁睐睛睡督睦睫睬睹瞄瞅瞌瞎瞒瞧瞩瞪瞬瞭瞳 -瞻矗矛矢矣知矩矫短矮石矾矿码砂砌砍研砕砖 -砚砰破砸砾础硅硕硝硫硬确碌碍碎碑碗碘碟碧 -碰碱碳確碾磁磅磊磕磨磷礁示礼社祀祈祖祝神 -祟祠祥票祭祷祸禀禁禄禅福禹离禽禾秀私秃秆 -秉秋种科秒秘租秤秦秧秩积称秸移秽稀程稍税 -稚稠稳稻稼稽稿穆積穏穗穴究穷空穿突窃窄窍 -窑窒窓窖窗窘窜窝窟窣窥窸窿立竖站竞竟章竣 -童竭端竹竿笋笑笔笙笛符笨第笺笼筆等筋筏筐 -筑筒答策筛筝筷筹签简箕算管箩箫箭箱節範篇 -篓篡篮篱篷簇簡簧簸簿籍米类籽粉粋粒粗粘粟 -粤粥粪粮粱粹精糊糕糖糙糟糠糯系紊純素索紧 -紫累細終組経結絮絵絶継続綺緑緒線練縛縮績 -繁繋繰纠红纤约级纪纫纬纯纱纲纳纵纷纸纹纺 -纽线练组绅细织终绊绍绎经绑绒结绕绘给绚络 -绝绞统绢绣继绩绪续绰绳维绵绷绸综绽绿缀缅 -缆缉缎缓缔缕编缘缚缝缠缤缩缭缰缴缶缸缺罐 -网罕罗罚罢罩罪置署羊美羔羚羞羡群羹羽翁翅 -翔翘翠翩翰翻翼耀老考者而耍耐耕耗耘耙耦耳 -耷耸耻耽耿聂聆聊聋职联聘聚聞聪肃肆肇肉肋 -肌肖肘肚肛肝肠股肢肤肥肩肪肮肯育肴肺肾肿 -胀胁胃胆背胎胖胚胜胞胡胧胰胳胶胸能脂脆脉 -脊脏脐脑脓脖脚脯脱脳脸脾腊腋腐腔腕腥腮腰 -腹腺腻腾腿膀膊膏膛膜膝膨臀臂臊臣自臭至致 -臼舀舅舆興舌舍舎舒舔舞舟航般舰舱舵舶船艇 -艘良艰色艳艺艾节芋芒芙芜芝芥芦芬芭芯花芳 -芸芹芽苇苍苏苑苔苗苛苞苟若苦英苹茁茂范茄 -茅茉茎茧茫茬茵茶茸荆草荐荒荔荡荣荤荧荫药 -荷莉莫莱莲获莹莺莽菇菊菌菜菠菩菱菲萄萌萍 -萎萝萤营萧萨落葉著葛葡董葫葬葱葵蒂蒋蒙蒜 -蒲蒸蓄蓉蓝蓬蔑蔓蔗蔚蔡蔬蔵蔼蔽蕉蕊蕴蕾薄 -薇薛薪薬薯藉藏藐藕藤藻蘑虎虏虐虑虚虫虹虽 -虾蚀蚁蚂蚊蚌蚓蚕蚣蚤蚪蚯蛀蛇蛋蛙蛛蛤蛮蛾 -蜀蜂蜈蜒蜓蜕蜗蜘蜜蜡蜻蝇蝉蝌蝎蝗蝙蝠蝴蝶 -螃融螺蟀蟆蟋蟹蠕蠢血衅行衍術衔街衙衝衡衣 -补表衫衬衰衷袁袄袋袍袖袜被袭袱裁裂装裏裕 -裙補裤裳裸裹褂褄複褐褒褥褪襟西要覆見規視 -覗覚覧観见观规觅视览觉角解触言計訓記訝設 -許診証評試詰話該詳誉誊認誓語説読誰調請論 -謝識警譬議计订认讥讨让训议讯记讲讳讶许讹 -论讼讽设访诀证评识诈诉诊词译试诗诚话诞诡 -询该详诫诬语误诱诲说诵请诸诺读诽课谁调谅 -谆谈谊谋谍谎谐谓谚谜谢谣谤谦谨谬谭谱谴谷 -豁豆豊豌豚象豪豫豹豺貌負費貼資質贅贝贞负 -贡财责贤败账货质贩贪贫贬购贮贯贰贱贴贵贷 -贸费贺贻贼贾贿赁赂赃资赋赌赎赏赐赔赖赘赚 -赛赞赠赡赢赣赤赦赫走赴赵赶起趁超越趋趟趣 -足趴趾跃跋跌跑跛距跟跡跤跨跪路跳践跷跺踊 -踏踝踢踩踪踮踱蹂蹄蹈蹋蹦蹬蹭蹲躁躏身躬躯 -躲躺車転軽載輪轄车轧轨轩转轮软轰轱轴轻载 -轿较辅辆辈辉辐辑输辖辗辘辙辛辜辞辟辣辨辩 -辫辰辱边辺辻込辽达辿迁迂迄迅过迈迎运近返 -还这进远违连迟迢迪迫迭述迷迹追退送适逃逆 -选逊透逐递途逗通逛逝逞速造逢連逮逸逻逼逾 -遂遅遇運遍過遏道違遗遠遣遥遭遮遵選避邀邑 -邓那邦邪邮邻郁郊郎郑部郭都鄂鄙酉酌配酒酗 -酝酣酥酪酬酱酵酷酸酿醇醉醋醒采释里重野量 -金針鉢鉴鋼錆録鏡针钉钓钙钝钞钟钠钢钥钦钧 -钩钮钱钳钻钾铁铃铅铆铐铛铜铝铬铭铲银铸铺 -链销锁锄锅锈锋锌锐错锚锡锣锤锥锦键锯锰锹 -锻镀镇镍镐镑镜镰镶長长門閉開間関閲闇门闪 -闭问闯闰闲间闷闸闹闺闻闽阀阁阅阈阎阐阔队 -阱防阳阴阵阶阻阿附际陆陈陋陌降限陕陡院除 -陥陨险陪陵陶陷陽隅隆隋階随隐隔隘隙障隠隧 -隶难雀雁雄雅集雇雌雏雕離難雨雪雲雳零雷雹 -雾需霄震霉霍霎霓霜霞霧露霸霹青靖静非靠靡 -面革靴靶鞋鞍鞠鞭韦韧韩韭音韵響頃項頑頭頼 -題額顔願類页顶顷项顺须顽顾顿颁颂预颅领颇 -颈颊频颓颖颗题颜额颠颤風风飕飘飛飞食飲餐 -館饥饭饮饰饱饲饵饶饺饼饿馁馅馆馈馋馍馏馒 -首香馨駄駆騒马驮驯驰驱驳驴驶驹驻驼驾骂骄 -骆骇验骏骑骗骚骡骤骨髓高鬓鬼魁魂魄魅魏魔 -魚鮮鱼鲁鲍鲜鲤鲨鲫鲸鳄鳍鳖鳞鳥鴉鸚鸟鸡鸣 -鸥鸦鸭鸯鸳鸵鸽鸿鹃鹅鹉鹊鹏鹤鹦鹰鹿麗麦麻 -黄黎黑黒黔默黙黯鼎鼓鼠鼻齐齿龄龙龟갚계귨 -꾣뇤덅됬뚳램묈뷴뼭섉솳숅쉪싧썮썹쐣펽풆퓳 -퓵！（），：；？ +养兼兽冀内円冇冈冉册再冒冗写军农冠冤冥冬 +冯冰冲决况冶冷冻冽净凄准凉凋凌减凑凛凝几 +凡凤処凭凯凰凳凶凸凹出击函凿刀刁刃分切刊 +刑划列刘则刚创初删判別刨利别刮到制刷券刹 +刺刻剂剃則削前剑剔剖剤剥剧剩剪副割剿劈力 +劝办功加务劣动助努劫励劲劳効势勃勇勉勋勒 +動勘募勢勤勧勺勾勿匀匂包匆匈匕化北匙匠匣 +匪匹区医匾匿十千升午卉半华协卑卒卓協单卖 +南単博卜占卡卢卤卦卧卫卯印危即却卵卷卸卿 +厂厄厅历厉压厌厕厘厚原厢厦厨厳去县叁参又 +叉及友双反収发叔取受变叙叛叠口古句另叨叩 +只叫召叭叮可台叱史右叶号司叹叼叽吁吃各吆 +合吉吊同名后吏吐向吓吕吗君吝吞吟吠否吧吨 +吩含听吭吮启吱吴吵吸吹吻吼吾呀呃呆呈告呐 +呑呕员呛呜呟呢周味呵呸呻呼命咄咆咋和咏咐 +咒咔咕咖咙咚咦咧咨咪咬咯咱咳咸咽哀品哄哆 +哇哈哉响哎哑哒哗哟哥哦哨哩哪哭哮哲哺哼唁 +唆唇唉唐唠唤唧唬售唯唱唾啃啄商啊問啡啤啥 +啦啧啪啰啸啼喂善喇喉喊喔喘喜喝喧喩喳喷喻 +嗅嗓嗜嗡嗦嗨嗯嗷嗽嘀嘈嘉嘘嘛嘞嘱嘲嘴嘶嘹 +嘻嘿噂噢器噩噪噬嚎嚣嚷嚼囊囚四回因团囤园 +困囱囲围固国图圃圆圈土圣圧在地场圾址均坊 +坎坏坐坑块坚坛坝坟坠坡坤坦坪坯坷垂垃垄型 +垒垛垢垦垫垮埂埃埋城域埠執培基堂堆堕堡堤 +堪堰報場堵塌塑塔塗塘塞塩填境墅墓墙增墟墨 +墩壁壊壤士壬壮声壳壶壹处备変复夏夕外多夜 +够夢大天太夫夭央夯失头夷夸夹夺奇奈奉奋奏 +契奔奖套奠奢奥女奴奶奸她好如妃妄妆妇妈妒 +妓妖妙妥妨妮妹妻姆姉姊始姐姑姓委姚姜姥姨 +姻姿威娃娄娇娘娜娟娥娱娶婆婉婚婪婴婶婿媒 +媚媳嫁嫂嫉嫌嫡嫩嬉子孔孕字存孙孝孟季孤学 +孩孵孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝 +实実宠审客宣室宦宪宫宰害宴宵家容宽宾宿寂 +寄寅密寇富寒寓寝寞察寡寥寨審寸对寺寻导対 +寿封専射将尉尊小少尔尖尘尚尝尤尧尬就尴尸 +尺尼尽尾尿局屁层居屈屉届屋屎屏屑展属屠屡 +層履屯山屹屿岁岂岔岖岗岛岩岭岳岸峡峦峨峭 +峰峻崇崎崔崖崛崩崭嵌巅巍川州巡巢巣工左巧 +巨巩巫差己已巳巴巷巾币市布帅帆师希帐帕帖 +帘帚帜帝带帧席帮帯帰帷常帽幅幌幕幢干平年 +并幸幻幼幽幾广広庄庆庇床序庐库应底店庙庚 +府庞废度座庭庵庶康庸廉廊廓延廷建开异弃弄 +弊式弓引弗弘弛弟张弥弦弧弯弱張強弹强归当 +录形彤彩彪彬彭彰影役彻彼往征径待很徊律後 +徐徒従得徘徙御復循微德徹徽心必忆忌忍志忘 +忙忠忧快忱念忽忿怀态怎怒怔怕怖怜思怠怡急 +性怨怪怯总恃恋恍恐恒恕恙恢恤恥恨恩恬恭息 +恰恳恶恼悄悉悍悔悖悟悠患悦您悩悪悬悯悲悴 +悼情惊惋惑惕惜惟惠惦惧惨惩惫惭惯惰想惶惹 +愁愈愉意愕愚愛感愣愤愧愿慈態慌慎慕慢慣慧 +慨慰慷憋憎憔憨憶憾懂懈懊懐懒懦戈戊戌戎戏 +成我戒或战戚截戳戴户戻房所扁扇扉手才扎扑 +扒打扔托扛扣执扩扫扬扭扮扯扰扳扶批扼找承 +技抄把抑抒抓投抖抗折抚抛抜択抠抡抢护报披 +抬抱抵抹押抽抿拂拄担拆拇拉拌拍拎拐拒拓拔 +拖拗拘拙招拜拟拡拢拣拥拦拧拨择括拭拯拱拳 +拴拷拼拽拾拿持挂指按挎挑挖挚挟挠挡挣挤挥 +挨挪挫振挺挽捂捅捆捉捋捌捍捎捏捐捕捜捞损 +捡换捣捧据捶捷捺捻掀掂授掉掌掏掐排掘掠探 +接控推掩措掰掷掺揉揍描提插換握揣揩揪揭援 +揺揽搀搁搂搅損搏搓搔搜搞搬搭携摄摆摇摊摔 +摘摧摩摸摹撇撑撒撕撞撤撩撬播撮撰撵撸撼擂 +擅操擎擒擦攀攒攥支收改攻放政故效敌敏救敗 +教敛敞敢散敦敬数敲整敵敷文斋斌斑斗料斜斟 +斤斥斧斩断斯新方施旁旅旋族旗无既日旦旧旨 +早旬旭旱时旷旺昂昆昌明昏易昔星映春昧昨昭 +是昼显時晃晋晌晒晓晕晚晦晨晩普景晰晴晶智 +晾暂暇暑暖暗暮暴曙曝曰曲更書曹曼曾替最月 +有朋服朔朗望朝期朦木未末本术朱朴朵机朽杀 +杂权杆杉李杏材村杖杜束杠条来杨杭杯杰東松 +板极构枉析枕林枚果枝枠枢枣枪枫枯架柄柏某 +柑柒染柔柜柠查柬柱柳柴査柿栅标栈栋栏树栓 +栖栗校株样核根格栽桂桃框案桌桐桑桔档桥桦 +桨桩桶梁梅梆梗梢梦梧梨梭梯械梳检棉棋棍棒 +棕棘棚棠森棱棵棺椅植椎椒検椭椰椿楚業楷楼 +楽概榄榆榔榕榜榨榴構槐様槛槽標樟模権横樱 +橄橘橙機橡橱檀檐檬欠次欢欣欧欲欺款歇歉歌 +止正此步武歧歩歪歹死歼殃殉殊残殖殴段殷殺 +殿毁毅母毎每毒比毕毙毛毡毫毯氏民氓气気氛 +氢氧氨氮氯水永汁求汇汉汐汗汚汛汝汞江池污 +汤汪汰汹決汽沁沃沈沉沐沙沛沟没沢沥沦沧沪 +沫沮河沸油治沼沽沾沿況泄泉泊泌法泛泞泡波 +泣泥注泪泰泳泵泻泼泽洁洋洒洗洛洞津洩洪洲 +活洼洽派流浅浆浇浊测济浏浑浓浙浦浩浪浮浴 +海浸涂消涉涌涕涛涝涡涣涤润涧涨涩涮涯液涵 +淀淆淋淌淑淘淡淤淫淮深淳混淹添清済渉渊渐 +渔渗渝渠渡渣渤温港渲渴游渺湃湖湘湾湿溃溅 +溉源準溜溢溪溯溶溺滇滋滑滔滚滞满滤滥滨滩 +滴漂漆漏漓演漠漫漱漾潇潘潜潤潭潮澄澈澎澜 +澡澳激濒瀑灌火灭灯灰灵灶灸灼灾灿炉炊炎炒 +炕炫炬炭炮炸点炼烁烂烈烘烙烛烟烤烦烧烫热 +烹焉焊焕焚無焦焰然焼煌煎煙煞煤照煩煮煽熄 +熊熏熔熙熟熬熱燃燕燥爆爪爬爱爵父爷爸爹爽 +片版牌牙牛牡牢牧物牲牵特牺犀犁犬犯状犹狂 +狈狐狗狞狠狡独狭狮狰狱狸狼猎猖猛猜猩猪猫 +猬献猴猾猿玄率玉王玖玛玩玫环现玲玷玻珊珍 +珠班現球琅理琉琐琢琳琴琼瑙瑞瑟瑰璃璧環瓜 +瓢瓣瓤瓦瓶瓷甘甚甜生産甥用甩甫田由甲申电 +男甸町画畅界畏畔留畜略番異畴畸疆疏疑疗疙 +疚疟疤疫疮疯疲疹疼疾病症痊痒痕痘痛痢痪痰 +痴痹瘟瘤瘦瘩瘪瘫瘸瘾療癌癣癸発登白百皂的 +皆皇皓皖皮皱皺皿盆盈益盏盐监盒盔盖盗盘盛 +盟目盯盲直相盹盼盾省眉看真眠眨眩眯眶眷眺 +眼着睁睐睛睡督睦睫睬睹瞄瞅瞌瞎瞒瞥瞧瞩瞪 +瞬瞭瞳瞻矗矛矢矣知矩矫短矮石矾矿码砂砌砍 +研砕砖砚砰破砸砾础硅硕硝硫硬确碌碍碎碑碗 +碘碟碧碰碱碳確碾磁磅磊磕磨磷礁示礼社祀祈 +祖祝神祟祠祥票祭祷祸禀禁禄禅福禹离禽禾秀 +私秃秆秉秋种科秒秘租秤秦秧秩积称秸移秽稀 +程稍税稚稠稳稻稼稽稿穆積穏穗穴究穷空穿突 +窃窄窍窑窒窓窖窗窘窜窝窟窣窥窸窿立竖站竞 +竟章竣童竭端竹竿笋笑笔笙笛符笨第笺笼筆等 +筋筏筐筑筒答策筛筝筷筹签简箕算管箩箫箭箱 +節範篇篓篡篮篱篷簇簡簧簸簿籍米类籽粉粋粒 +粗粘粟粤粥粪粮粱粹精糊糕糖糙糟糠糯系紊純 +素索紧紫累細終組経結絮絵絶継続綺緑緒線練 +縛縮績繁繋繰纠红纤约级纪纫纬纯纱纲纳纵纷 +纸纹纺纽线练组绅细织终绊绍绎经绑绒结绕绘 +给绚络绝绞统绢绣继绩绪续绰绳维绵绷绸综绽 +绿缀缅缆缉缎缓缔缕编缘缚缝缠缤缩缭缰缴缶 +缸缺罐网罕罗罚罢罩罪置署羊美羔羚羞羡群羹 +羽翁翅翔翘翠翩翰翻翼耀老考者而耍耐耕耗耘 +耙耦耳耷耸耻耽耿聂聆聊聋职联聘聚聞聪肃肆 +肇肉肋肌肖肘肚肛肝肠股肢肤肥肩肪肮肯育肴 +肺肾肿胀胁胃胆背胎胖胚胜胞胡胧胰胳胶胸能 +脂脆脉脊脏脐脑脓脖脚脯脱脳脸脾腊腋腐腔腕 +腥腮腰腹腺腻腾腿膀膊膏膛膜膝膨臀臂臊臣自 +臭至致臼舀舅舆興舌舍舎舒舔舞舟航般舰舱舵 +舶船艇艘良艰色艳艺艾节芋芒芙芜芝芥芦芬芭 +芯花芳芸芹芽苇苍苏苑苔苗苛苞苟若苦英苹茁 +茂范茄茅茉茎茧茫茬茵茶茸荆草荐荒荔荡荣荤 +荧荫药荷莉莫莱莲获莹莺莽菇菊菌菜菠菩菱菲 +萄萌萍萎萝萤营萧萨落葉著葛葡董葫葬葱葵蒂 +蒋蒙蒜蒲蒸蓄蓉蓝蓬蔑蔓蔗蔚蔡蔬蔵蔼蔽蕉蕊 +蕴蕾薄薇薛薪薬薯藉藏藐藕藤藻蘑虎虏虐虑虚 +虫虹虽虾蚀蚁蚂蚊蚌蚓蚕蚣蚤蚪蚯蛀蛇蛋蛙蛛 +蛤蛮蛾蜀蜂蜈蜒蜓蜕蜗蜘蜜蜡蜻蝇蝉蝌蝎蝗蝙 +蝠蝴蝶螃融螺蟀蟆蟋蟹蠕蠢血衅行衍術衔街衙 +衝衡衣补表衫衬衰衷袁袄袋袍袖袜被袭袱裁裂 +装裏裕裙補裤裳裸裹褂褄複褐褒褥褪襟西要覆 +見規視覗覚覧観见观规觅视览觉角解触言計訓 +記訝設許診証評試詰話該詳誉誊認誓語説読誰 +調請論謝識警譬議计订认讥讨让训议讯记讲讳 +讶许讹论讼讽设访诀证评识诈诉诊词译试诗诚 +话诞诡询该详诫诬语误诱诲说诵请诸诺读诽课 +谁调谅谆谈谊谋谍谎谐谓谚谜谢谣谤谦谨谬谭 +谱谴谷豁豆豊豌豚象豪豫豹豺貌負費貼資質贅 +贝贞负贡财责贤败账货质贩贪贫贬购贮贯贰贱 +贴贵贷贸费贺贻贼贾贿赁赂赃资赋赌赎赏赐赔 +赖赘赚赛赞赠赡赢赣赤赦赫走赴赵赶起趁超越 +趋趟趣足趴趾跃跋跌跑跛距跟跡跤跨跪路跳践 +跷跺踊踏踝踢踩踪踮踱蹂蹄蹈蹋蹦蹬蹭蹲躁躏 +身躬躯躲躺車転軽載輪轄车轧轨轩转轮软轰轱 +轴轻载轿较辅辆辈辉辐辑输辖辗辘辙辛辜辞辟 +辣辨辩辫辰辱边辺辻込辽达辿迁迂迄迅过迈迎 +运近返还这进远违连迟迢迪迫迭述迷迹追退送 +适逃逆选逊透逐递途逗通逛逝逞速造逢連逮逸 +逻逼逾遂遅遇運遍過遏道違遗遠遣遥遭遮遵選 +避邀邑邓那邦邪邮邻郁郊郎郑部郭都鄂鄙酉酌 +配酒酗酝酣酥酪酬酱酵酷酸酿醇醉醋醒采释里 +重野量金針鉢鉴鋼錆録鏡针钉钓钙钝钞钟钠钢 +钥钦钧钩钮钱钳钻钾铁铃铅铆铐铛铜铝铬铭铲 +银铸铺链销锁锄锅锈锋锌锐错锚锡锣锤锥锦键 +锯锰锹锻镀镇镍镐镑镜镰镶長长門閉開間関閲 +闇门闪闭问闯闰闲间闷闸闹闺闻闽阀阁阅阈阎 +阐阔队阱防阳阴阵阶阻阿附际陆陈陋陌降限陕 +陡院除陥陨险陪陵陶陷陽隅隆隋階随隐隔隘隙 +障隠隧隶难雀雁雄雅集雇雌雏雕離難雨雪雲雳 +零雷雹雾需霄震霉霍霎霓霜霞霧露霸霹青靖静 +非靠靡面革靴靶鞋鞍鞠鞭韦韧韩韭音韵響頃項 +頑頭頼題額顔願類页顶顷项顺须顽顾顿颁颂预 +颅领颇颈颊频颓颖颗题颜额颠颤風风飕飘飛飞 +食飲餐館饥饭饮饰饱饲饵饶饺饼饿馁馅馆馈馋 +馍馏馒首香馨駄駆騒马驮驯驰驱驳驴驶驹驻驼 +驾骂骄骆骇验骏骑骗骚骡骤骨髓高鬓鬼魁魂魄 +魅魏魔魚鮮鱼鲁鲍鲜鲤鲨鲫鲸鳄鳍鳖鳞鳥鴉鸚 +鸟鸡鸣鸥鸦鸭鸯鸳鸵鸽鸿鹃鹅鹉鹊鹏鹤鹦鹰鹿 +麗麦麻黄黎黑黒黔默黙黯鼎鼓鼠鼻齐齿龄龙龟 +갚계귨꾣뇤덅됬뚳램묈뷴뼭섉솳숅쉪싧썮썹쐣 +펽풆퓳퓵！（），：；？� diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/Old/Play Tool Panel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/Old/Play Tool Panel.prefab index 8dbf17a90..0a0482aa6 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/Old/Play Tool Panel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/Old/Play Tool Panel.prefab @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -596,7 +596,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9081192056485139028} - - {fileID: 2435851631326673332} - {fileID: 3369822658199011853} - {fileID: 1952989201910221321} - {fileID: 3098988001922718290} @@ -855,109 +854,3 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3622325189041885854, guid: 877dc95297a9acb4a9b66f121f651c89, type: 3} m_PrefabInstance: {fileID: 5495506033271881930} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8076493392685741364 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5358297362873264388} - m_Modifications: - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7330211784666670000, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_Name - value: "\u8B66\u544A\u7A97\u53E3" - objectReference: {fileID: 0} - - target: {fileID: 7330211784666670000, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} ---- !u!224 &2435851631326673332 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5897628450865974400, guid: 80d320c5398c99a478ed9af1f7c34e38, type: 3} - m_PrefabInstance: {fileID: 8076493392685741364} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/GameContent/Scene_Subway/Art/电视新闻.psd b/Assets/GameContent/Scene_Subway/Art/电视新闻.psd index 18ebffbe8..45da8235d 100644 --- a/Assets/GameContent/Scene_Subway/Art/电视新闻.psd +++ b/Assets/GameContent/Scene_Subway/Art/电视新闻.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60cb3e5a2c4113fce71f6555f617a528fd6d5f72b5335e702cc7fbac0a0ce605 -size 161506 +oid sha256:ba4b3075c7bfdfc64df9dfe4443272b2e0d2294a68e2175ba6fd5fcfbc070ac5 +size 150515 diff --git a/Assets/GameContent/Scene_Subway/Art/电视新闻.psd.meta b/Assets/GameContent/Scene_Subway/Art/电视新闻.psd.meta index 139d34c05..b53cfb9fe 100644 --- a/Assets/GameContent/Scene_Subway/Art/电视新闻.psd.meta +++ b/Assets/GameContent/Scene_Subway/Art/电视新闻.psd.meta @@ -106,9 +106,9 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 4 - width: 78 - height: 49 + y: 382 + width: 208 + height: 118 spriteID: 21b078743c48d8a49b2888f337d0792e spriteBone: [] spriteOutline: [] @@ -117,19 +117,19 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - spritePosition: {x: 9, y: 73} - - name: "\u673A\u4F53\u9003\u8DD1" + uvTransform: {x: 4, y: 382} + spritePosition: {x: 1, y: 0} + - name: "\u82F1\u91CC\u6F14\u8BB2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 61 - width: 78 - height: 49 + x: 221 + y: 4 + width: 208 + height: 118 spriteID: b1293938a006e334d81800e97dd9131f spriteBone: [] spriteOutline: [] @@ -138,9 +138,9 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 61} - spritePosition: {x: 9, y: 10} - - name: "\u82F1\u91CC\u6F14\u8BB2" + uvTransform: {x: 221, y: 4} + spritePosition: {x: 1, y: 0} + - name: "\u673A\u4F53\u9003\u8DD1" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -148,10 +148,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 118 - width: 78 - height: 49 - spriteID: 5b54467ecda9de1468bec81f60ba06bf + y: 4 + width: 209 + height: 118 + spriteID: 9a199530abc9ca44f83e55a3b25ceaca spriteBone: [] spriteOutline: [] vertices: [] @@ -159,8 +159,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 118} - spritePosition: {x: 96, y: 73} + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} - name: "\u7F50\u5934" originalName: pivot: {x: 0.5, y: 0.5} @@ -169,10 +169,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 175 - width: 78 - height: 49 - spriteID: c46c71dd825550d45b7aa043e9b2e934 + y: 130 + width: 209 + height: 118 + spriteID: 875d62816afa4294bb2e9c66f5bf663b spriteBone: [] spriteOutline: [] vertices: [] @@ -180,8 +180,29 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 175} - spritePosition: {x: 96, y: 10} + uvTransform: {x: 4, y: 130} + spritePosition: {x: 0, y: 0} + - name: "\u65B0\u95FB" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 256 + width: 209 + height: 118 + spriteID: 03b038698ba922b40b18281c3e2b7283 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 256} + spritePosition: {x: 0, y: 0} rigSpriteImportData: - name: "news \u65B0\u89C4\u901A\u8FC7" originalName: @@ -465,7 +486,7 @@ ScriptedImporter: documentPivot: {x: 0, y: 0} documentAlignment: 0 importHiddenLayers: 0 - layerMappingOption: 2 + layerMappingOption: 0 generatePhysicsShape: 0 paperDollMode: 0 keepDupilcateSpriteName: 1 @@ -477,23 +498,23 @@ ScriptedImporter: spritePackingTag: resliceFromLayer: 1 mosaicPSDLayers: + - name: "\u5168\u753B\u5E45\u65B0\u95FBlogo" + spriteName: + isGroup: 0 + parentIndex: -1 + spriteID: dff7c866ff0d1a74a8a997ae1f048267 + layerID: 11 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 - name: "\u65B0\u89C4\u901A\u8FC7" spriteName: "\u65B0\u89C4\u901A\u8FC7" isGroup: 0 parentIndex: -1 spriteID: 21b078743c48d8a49b2888f337d0792e layerID: 10 - mosaicPosition: {x: 4, y: 4} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: "\u673A\u4F53\u9003\u8DD1" - spriteName: "\u673A\u4F53\u9003\u8DD1" - isGroup: 0 - parentIndex: -1 - spriteID: b1293938a006e334d81800e97dd9131f - layerID: 9 - mosaicPosition: {x: 4, y: 61} + mosaicPosition: {x: 4, y: 382} flatten: 0 isImported: 1 isVisible: 1 @@ -501,9 +522,19 @@ ScriptedImporter: spriteName: "\u82F1\u91CC\u6F14\u8BB2" isGroup: 0 parentIndex: -1 - spriteID: 5b54467ecda9de1468bec81f60ba06bf - layerID: 8 - mosaicPosition: {x: 4, y: 118} + spriteID: b1293938a006e334d81800e97dd9131f + layerID: 9 + mosaicPosition: {x: 221, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u673A\u4F53\u9003\u8DD1" + spriteName: "\u673A\u4F53\u9003\u8DD1" + isGroup: 0 + parentIndex: -1 + spriteID: 9a199530abc9ca44f83e55a3b25ceaca + layerID: 6 + mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -511,62 +542,22 @@ ScriptedImporter: spriteName: "\u7F50\u5934" isGroup: 0 parentIndex: -1 - spriteID: c46c71dd825550d45b7aa043e9b2e934 - layerID: 7 - mosaicPosition: {x: 4, y: 175} + spriteID: 875d62816afa4294bb2e9c66f5bf663b + layerID: 13 + mosaicPosition: {x: 4, y: 130} flatten: 0 isImported: 1 isVisible: 1 - - name: SCREEN - spriteName: SCREEN + - name: "\u65B0\u95FB" + spriteName: "\u65B0\u95FB" isGroup: 0 parentIndex: -1 - spriteID: 9a199530abc9ca44f83e55a3b25ceaca - layerID: 6 - mosaicPosition: {x: 4, y: 616} + spriteID: 03b038698ba922b40b18281c3e2b7283 + layerID: 14 + mosaicPosition: {x: 4, y: 256} flatten: 0 - isImported: 0 - isVisible: 0 - - name: TV - spriteName: TV - isGroup: 0 - parentIndex: -1 - spriteID: 366a3f35e257ed24499dba0cb3dc9006 - layerID: 5 - mosaicPosition: {x: 4, y: 452} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: animation - spriteName: animation - isGroup: 0 - parentIndex: -1 - spriteID: 3fb37e202070c7f4cad4cab81a7c08e3 - layerID: 4 - mosaicPosition: {x: 482, y: 228} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: night - spriteName: night - isGroup: 0 - parentIndex: -1 - spriteID: 93e1b33c0b988f24d89515732bbf162f - layerID: 3 - mosaicPosition: {x: 4, y: 4} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: day - spriteName: day - isGroup: 0 - parentIndex: -1 - spriteID: c431edd9acab19044849d8babf52d356 - layerID: 2 - mosaicPosition: {x: 4, y: 228} - flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 rigPSDLayers: - name: "news \u65B0\u89C4\u901A\u8FC7" spriteName: "news \u65B0\u89C4\u901A\u8FC7" diff --git a/Assets/RawResources/Art/Obj/D2S女孩4.png b/Assets/RawResources/Art/梦境素材/梦境图片/D2S女孩4.png similarity index 100% rename from Assets/RawResources/Art/Obj/D2S女孩4.png rename to Assets/RawResources/Art/梦境素材/梦境图片/D2S女孩4.png diff --git a/Assets/RawResources/Art/Obj/D2S女孩4.png.meta b/Assets/RawResources/Art/梦境素材/梦境图片/D2S女孩4.png.meta similarity index 72% rename from Assets/RawResources/Art/Obj/D2S女孩4.png.meta rename to Assets/RawResources/Art/梦境素材/梦境图片/D2S女孩4.png.meta index 1e863bbb2..f8dddad33 100644 --- a/Assets/RawResources/Art/Obj/D2S女孩4.png.meta +++ b/Assets/RawResources/Art/梦境素材/梦境图片/D2S女孩4.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -106,6 +106,45 @@ TextureImporter: 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: iPhone + 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: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 78aa44ec0..117e9be4b 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9497,6 +9497,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2091451641} m_Modifications: + - target: {fileID: 2271453673397018821, guid: 46012f47c455f2a439c777c08b1f5393, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5358297362873264388, guid: 46012f47c455f2a439c777c08b1f5393, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9577,18 +9581,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5424929553171325091, guid: 46012f47c455f2a439c777c08b1f5393, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7548078866038160482, guid: 46012f47c455f2a439c777c08b1f5393, type: 3} propertyPath: m_Name value: Play Tool Panel objectReference: {fileID: 0} - - target: {fileID: 7715856805303343576, guid: 46012f47c455f2a439c777c08b1f5393, type: 3} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index a3d18729a..eb623baeb 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -568,9 +568,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ceb74596ad944c8e9c599f00a445c8a3, type: 3} m_Name: m_EditorClassIdentifier: - subwaySlots: {fileID: 143273129} - tvSlots: {fileID: 494482151} - newsSpriteRenderer: {fileID: 5352226562362177808} + newsSpriteRenderer: {fileID: 8127144399698162647} arriveStation: {fileID: 969974277} carMotion: {fileID: 9100001001} --- !u!1 &226184625 @@ -820,16 +818,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6bb1b847b634daca8351126b7e717d6, type: 3} m_Name: m_EditorClassIdentifier: - actorData: - onSave: - m_PersistentCalls: - m_Calls: [] - actorName: - slotName: - actorType: 0 - stateName: - alpha: 0 - faceParam: 0 --- !u!212 &252705166 SpriteRenderer: m_ObjectHideFlags: 0 @@ -3740,6 +3728,312 @@ MonoBehaviour: minWidth: 350 bubbleStyle: {fileID: 11400000, guid: 35c8acdf9f163414cbf0701f45793e94, type: 2} pivotType: 1 +--- !u!114 &9100001001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546256081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22b2f701b86b458fae30ddb4a612c419, type: 3} + m_Name: + m_EditorClassIdentifier: + calmIntervalMin: 0.7 + calmIntervalMax: 2.2 + joltPeakMin: 0.6 + joltPeakMax: 1.4 + joltDurationMin: 0.18 + joltDurationMax: 0.32 + joltBurstCount: {x: 1, y: 3} + joltBurstGapMin: 0.12 + joltBurstGapMax: 0.28 + calmNoiseAmplitude: 0.03 + brakePeakAccel: 1.6 + brakeAccelCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 4 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.65 + inSlope: -0.5 + outSlope: -0.5 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.5 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + accelSmoothTime: 0.025 +--- !u!114 &9100002001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88656234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325261251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 347095460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450826707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497537572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702647398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901117875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1926948637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4324682127354924289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} +--- !u!114 &9100002010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847544086954038309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} + m_Name: + m_EditorClassIdentifier: + carMotion: {fileID: 9100001001} + length: 0.42 + gravity: 9.81 + dampingRatio: 0.16 + maxAngle: 25 + maxAngularSpeed: 180 + maxIntegrationStep: 0.008333334 + randomizeOnAwake: 1 + lengthVariation: 0.03 + dampingRatioRange: {x: 0.14, y: 0.18} + initialAngleRange: 0.5 + hangPointLocalOffset: {x: 0, y: 0, z: 0} --- !u!4 &129647964801808281 Transform: m_ObjectHideFlags: 0 @@ -3981,21 +4275,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1653048031908698039 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3949948302112789128} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.2325573, y: 1.8372092, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5924190533061430499} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1855525890014860020 Transform: m_ObjectHideFlags: 0 @@ -4296,23 +4575,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &3949948302112789128 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1653048031908698039} - - component: {fileID: 5352226562362177808} - m_Layer: 0 - m_Name: "\u5C0F\u65B0\u95FB" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &4103782223475585769 Transform: m_ObjectHideFlags: 0 @@ -4580,58 +4842,6 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!212 &5352226562362177808 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3949948302112789128} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: -7203286025071436463, guid: ca80fd96dc71f714a988b27d9ca6c61c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.627907, y: 2.2790697} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &5419575434293045770 GameObject: m_ObjectHideFlags: 0 @@ -4661,7 +4871,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1653048031908698039} - {fileID: 2695904934726658742} - {fileID: 129647964801808281} - {fileID: 9176668305076229203} @@ -5547,309 +5756,3 @@ SceneRoots: - {fileID: 163812961} - {fileID: 1929645612} - {fileID: 1767040865} ---- !u!114 &9100001001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 546256081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22b2f701b86b458fae30ddb4a612c419, type: 3} - m_Name: - m_EditorClassIdentifier: - calmIntervalMin: 0.7 - calmIntervalMax: 2.2 - joltPeakMin: 0.6 - joltPeakMax: 1.4 - joltDurationMin: 0.18 - joltDurationMax: 0.32 - joltBurstCount: {x: 1, y: 3} - joltBurstGapMin: 0.12 - joltBurstGapMax: 0.28 - calmNoiseAmplitude: 0.03 - brakePeakAccel: 1.6 - brakeAccelCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 4 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.65 - inSlope: -0.5 - outSlope: -0.5 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.5 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - accelSmoothTime: 0.025 ---- !u!114 &9100002001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88656234} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 325261251} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 347095460} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450826707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 497537572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702647398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002007 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901117875} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1926948637} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4324682127354924289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} ---- !u!114 &9100002010 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4847544086954038309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 982dbdad2132464f978518ffdf1737ee, type: 3} - m_Name: - m_EditorClassIdentifier: - carMotion: {fileID: 9100001001} - length: 0.42 - gravity: 9.81 - dampingRatio: 0.16 - maxAngle: 25 - maxAngularSpeed: 180 - maxIntegrationStep: 0.008333334 - randomizeOnAwake: 1 - lengthVariation: 0.03 - dampingRatioRange: {x: 0.14, y: 0.18} - initialAngleRange: 0.5 - hangPointLocalOffset: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Game Loop/GameManager.cs b/Assets/Scripts/Game Loop/GameManager.cs index f4f1f955c..2330b756c 100644 --- a/Assets/Scripts/Game Loop/GameManager.cs +++ b/Assets/Scripts/Game Loop/GameManager.cs @@ -515,7 +515,7 @@ namespace AibisDream TrySetPhase(GameSessionPhase.Playing); EnumEventSystem.Global.Send(GameLifecycleEvent.SessionReady); ScreenSnapshotHelper.ApplyDeferredFadeScreenIfNeeded(); - yield return FadeOut(); + // yield return FadeOut(); } finally { diff --git a/Assets/Scripts/UI/Panel/PlayToolPanel.cs b/Assets/Scripts/UI/Panel/PlayToolPanel.cs index 52acbe1a4..49ffe0b7b 100644 --- a/Assets/Scripts/UI/Panel/PlayToolPanel.cs +++ b/Assets/Scripts/UI/Panel/PlayToolPanel.cs @@ -58,7 +58,6 @@ namespace AibisDream.UI _fullScreenImage = transform.Find("Full Screen Image").GetComponent(); _window = transform.Find("进度条窗口").GetComponent(); _redFlash = transform.Find("Red Flash").GetComponent(); - _warningWindow = transform.Find("警告窗口").GetComponent(); _signBoard = transform.GetComponentInChildren(); _timeTurner = transform.GetComponentInChildren(); } diff --git a/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn index 4211fb630..6a4a525b8 100644 --- a/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn +++ b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn @@ -376,10 +376,13 @@ position: -1093,-1245 他的表情变了，你忽然看不清他的脸。 boy: 你不应该再回来了。 <> - 你把不再看他，把手放在门把手上。 + 你不再看他，把手放在门把手上。 //【TODO】——SFX：吱呀 <> <> +->上去<2>> + <> + <> ->下楼<> #line:0bf285a #deps:gameStage <> <> @@ -525,10 +528,11 @@ tags: hub ->更近一些 #line:00f87b1 <> ->返回 #line:07be273 - <> + // <> + <> ->出去 #line:09312e4 -<> -<> + <> + <> === title: 天文台_入场 diff --git a/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarnproject b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarnproject index df9effaa4..64df55bf3 100644 --- a/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarnproject +++ b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarnproject @@ -1,19 +1,19 @@ { - "projectFileVersion": 3, - "sourceFiles": [ - "**/*.yarn" - ], - "excludeFiles": [ - "**/*~/*" - ], - "localisation": { - "en": { - "strings": "FP_Day1_sleep-en.csv" + "projectFileVersion": 3, + "sourceFiles": [ + "**/*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": { + "en": { + "strings": "FP_Day1_sleep-en.csv" + }, + "ja-JP": { + "strings": "FP_Day1_sleep-ja.csv" + } }, - "ja-JP": { - "strings": "FP_Day1_sleep-ja.csv" - } - }, - "baseLanguage": "zh-Hans", - "compilerOptions": {} + "baseLanguage": "zh-Hans", + "compilerOptions": {} } \ No newline at end of file diff --git a/Tools/collect_font_characters.py b/Tools/collect_font_characters.py new file mode 100644 index 000000000..dfd76a742 --- /dev/null +++ b/Tools/collect_font_characters.py @@ -0,0 +1,149 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""收集剧本字符并生成字体字符集文件。 + +用法: + python Tools/collect_font_characters.py +""" + +from __future__ import annotations + +import os +import sys +import tempfile +from pathlib import Path + + +PROJECT_ROOT = Path(__file__).resolve().parent.parent +SOURCE_RELATIVE_PATH = Path("Assets/Yarn/FP") +TARGET_RELATIVE_PATH = Path("Assets/Font/字符统计.txt") +LINE_WIDTH = 20 +EXCLUDED_CHARACTERS = {"\ufeff", "\r", "\n"} + + +class CharacterCollectionError(RuntimeError): + """字符统计失败。""" + + +def find_source_files(source_root: Path) -> tuple[list[Path], list[Path]]: + """递归查找 Yarn 和 CSV 文件，并返回稳定排序后的路径。""" + if not source_root.is_dir(): + raise CharacterCollectionError(f"剧本目录不存在: {source_root}") + + yarn_files: list[Path] = [] + csv_files: list[Path] = [] + for path in source_root.rglob("*"): + if not path.is_file(): + continue + + suffix = path.suffix.lower() + if suffix == ".yarn": + yarn_files.append(path) + elif suffix == ".csv": + csv_files.append(path) + + sort_key = lambda path: path.as_posix() + yarn_files.sort(key=sort_key) + csv_files.sort(key=sort_key) + return yarn_files, csv_files + + +def read_characters(path: Path) -> set[str]: + """读取 UTF-8 文本并返回其中可写入字符集文件的字符。""" + try: + text = path.read_text(encoding="utf-8-sig") + except (OSError, UnicodeError) as error: + raise CharacterCollectionError(f"无法读取文件 {path}: {error}") from error + + return {character for character in text if character not in EXCLUDED_CHARACTERS} + + +def collect_characters( + source_root: Path, target_path: Path +) -> tuple[set[str], int, int]: + """合并全部剧本文件与现有字符统计文件中的字符。""" + yarn_files, csv_files = find_source_files(source_root) + characters: set[str] = set() + + for path in [*yarn_files, *csv_files]: + characters.update(read_characters(path)) + + if target_path.exists(): + characters.update(read_characters(target_path)) + + return characters, len(yarn_files), len(csv_files) + + +def format_characters(characters: set[str], line_width: int = LINE_WIDTH) -> str: + """按 Unicode 码点排序，并按固定字符数生成 CRLF 文本。""" + if line_width <= 0: + raise ValueError("line_width 必须大于 0") + + ordered = sorted( + character + for character in characters + if character not in EXCLUDED_CHARACTERS + ) + lines = [ + "".join(ordered[index : index + line_width]) + for index in range(0, len(ordered), line_width) + ] + return "\r\n".join(lines) + ("\r\n" if lines else "") + + +def write_atomic_utf8_bom(target_path: Path, content: str) -> None: + """以 UTF-8 BOM 原子覆盖目标文件，避免失败时留下半截内容。""" + if not target_path.parent.is_dir(): + raise CharacterCollectionError(f"输出目录不存在: {target_path.parent}") + + temporary_path: Path | None = None + try: + with tempfile.NamedTemporaryFile( + mode="wb", + prefix=f".{target_path.name}.", + suffix=".tmp", + dir=target_path.parent, + delete=False, + ) as temporary_file: + temporary_path = Path(temporary_file.name) + temporary_file.write(content.encode("utf-8-sig")) + temporary_file.flush() + os.fsync(temporary_file.fileno()) + + os.replace(temporary_path, target_path) + temporary_path = None + except (OSError, UnicodeError) as error: + raise CharacterCollectionError(f"无法写入文件 {target_path}: {error}") from error + finally: + if temporary_path is not None: + try: + temporary_path.unlink(missing_ok=True) + except OSError: + pass + + +def generate_character_file(project_root: Path = PROJECT_ROOT) -> tuple[int, int, int]: + """收集项目字符、覆盖目标文件，并返回 Yarn/CSV/字符数量。""" + source_root = project_root / SOURCE_RELATIVE_PATH + target_path = project_root / TARGET_RELATIVE_PATH + characters, yarn_count, csv_count = collect_characters(source_root, target_path) + write_atomic_utf8_bom(target_path, format_characters(characters)) + return yarn_count, csv_count, len(characters) + + +def main() -> int: + try: + yarn_count, csv_count, character_count = generate_character_file() + except CharacterCollectionError as error: + print(f"[错误] {error}", file=sys.stderr) + return 1 + + print(f"扫描 Yarn 文件: {yarn_count}") + print(f"扫描 CSV 文件: {csv_count}") + print(f"唯一字符数量: {character_count}") + print(f"已写入: {PROJECT_ROOT / TARGET_RELATIVE_PATH}") + return 0 + + +if __name__ == "__main__": + sys.exit(main())