diff --git a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset index 01e41ec3c..2e6bcaf01 100644 --- a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:017c375e228776476f87629635e314357f4bdfc8e6a6070190e49ebc291b4958 -size 70545627 +oid sha256:8fa47ace259d545623ced9131e3c415a141643ac86d582c74213b9c486c5387f +size 70549864 diff --git a/Assets/Resources/Prefabs/FontAsset/word_set.txt b/Assets/Resources/Prefabs/FontAsset/word_set.txt index 5de39fc56..49d0a7765 100644 --- a/Assets/Resources/Prefabs/FontAsset/word_set.txt +++ b/Assets/Resources/Prefabs/FontAsset/word_set.txt @@ -1,2 +1,2 @@ -🎵"#$%&'()*+,-_./0123456789:<=>@ABCDEFGHIJKLMNOPQRSTUVWYZ[]^abcdefghijklmnopqrstuvwxyz—“”…→①②、。「」【】一丁七万丈三上下不与丐丑专且丕世丘丙业丛东丝丞丟丢两严並丧个丫中丰串临丸丹为主丽举乃久么义之乌乍乎乏乐乒乓乔乖乘乙九乞也习乡书乩买乱乳乾亂了予争事二于亏云互亓五井亘亙亚些亞亟亡亢交亥亦产亨亩享京亭亮亲亳亵人亿什仁仃仄仅仆仇今介仍从仑仓仔仕他仗付仙仞仟代令以仨仪仫们仰仲仳件价任份仿企伉伊伋伍伎伏伐休伕众优伙会伞伟传伤伥伦伧伪伫伯估伴伶伸伺似伽佃但佇佈位低住佐佑体佔何佗余佚佛作佝佞佟你佣佥佩佬佯佰佳併佺佻佼佾使侃侄來侈例侍侏侑侖供依侠侣侥侦侧侨侩侮侯侵侶侷便係促俄俊俎俏俐俑俗俘俚保俞俟俠信俨俩俪俭修俯俱俳俶俸俺俾倀倆倉個倌倍倏們倒倔倖倘候倚倜借倡倣倥倦倨倩倪倫倭债值倾偃假偈偉偌偎偏偕做停健偬偭偯側偵偶偷偺偻偽偿傀傅傈傍傑傖傘備傚傢傥傧储傩催傭傯傲傳債傷傻傾僅僇僎像僑僕僖僚僥僧僩僭僮僱僳僵價僻儀儂億儅儆儈儉儋儐儒儔儕儘儛償儡優儲儳儿兀允元兄充兆兇先光克兌免兑兒兔兕兗党兜兢入內全兩八公六兮兰共关兴兵其具典兹养兼兽冀内冈冉冊册再冑冒冕冗写军农冠冢冤冥冪冬冯冰冲决况冶冷冻冽净凄准凉凋凌凍减凑凛凜凝几凡凤凭凯凰凱凳凶凸凹出击函凿刀刁刃分切刈刊刎刑划刖列刘则刚创初删判別刨利刪别刮到刳制刷券刹刺刻刽剁剂剃則削剋剌前剎剐剑剔剖剛剜剝剡剥剧剩剪副割剴創剷剽剿劂劃劇劈劉劊劍劑劓力劝办功加务劣动助努劫劬励劲劳劻劾势勁勃勇勉勋勒動勗勘務勛勝勞募勢勣勤勦勰勳勵勸勺勻勾勿匀包匆匈匍匏匐匕化北匙匝匠匡匣匪匮匯匱匹区医匾匿區十千卅升午卉半华协卑卒卓協单卖南博卜卞占卡卢卤卦卧卫卮卯印危即却卵卷卸卹卻卿厂厄厅历厉压厌厕厘厚厝原厢厥厦厨厩厭厮厲去县叁参參又叉及友双反发叔取受变叙叛叟叠叢口古句另叨叩只叫召叭叮可台叱史右叵叶号司叹叻叼叽吁吃各吆合吉吊吋同名后吏吐向吒吓吕吗吙君吝吞吟吠否吧吨吩含听吭吮启吱吳吴吵吶吸吹吻吼吾呀呂呃呆呈告呎呐呕呗员呛呜呢呦周呱呲味呵呶呷呸呻呼命咀咂咄咆咋和咎咏咐咒咔咕咖咙咚咛咝咣咤咦咧咨咩咪咫咬咯咱咳咸咻咽咿哀品哂哄哆哇哈哉响哎哐哑哒哓哗哝哟員哥哦哧哨哩哪哭哮哱哲哺哼哽唁唆唇唉唏唐唔唠唤唧唬售唯唰唱唳唷唸唾啁啃啄商啊問啕啖啗啜啞啟啡啣啤啥啦啧啪啬啰啷啸啻啼啾喀喂喃善喆喇喉喊喋喑喔喘喙喚喜喝喟喧喪喫喬單喱喲喳喷喻喽嗅嗆嗇嗉嗎嗐嗑嗒嗓嗔嗖嗙嗚嗜嗝嗟嗡嗣嗤嗥嗦嗨嗫嗬嗯嗶嗷嗽嗾嘀嘁嘆嘈嘉嘍嘎嘐嘔嘖嘗嘘嘚嘛嘟嘡嘩嘫嘭嘮嘯嘰嘱嘲嘴嘶嘹嘻嘿噌噎噓噔噗噘噙噜噢噤噥器噩噪噫噬噯噱噴噶噸噹噻噼嚀嚅嚇嚎嚏嚐嚓嚕嚣嚥嚮嚷嚼囊囔囚四囝回因团囤囪囫园困囱围囵固国图囿圃圄圆圈圉國圍園圓圖團土圣在圩圬圭圯地圳场圻圾址坂均坊坍坎坏坐坑块坚坛坝坞坟坠坡坤坦坨坩坪坳坷坼垂垃垄垆型垒垓垕垛垠垢垣垦垫垭垮埂埃埋城埔埚埜域埠埤執培基堂堅堆堉堊堑堕堙堝堠堡堤堪堯堰報場堵塊塋塌塑塒塔塗塘塚塞塢填塭塵塹塽塾墀境墅墉墊墓墙墜增墟墡墦墨墩墮墳墾壁壅壇壎壑壓壕壘壙壞壢壤士壬壮壯声壳壶壹壺壽处备复夏夔夕外夙多夜够夠夢夤夥大天太夫夭央夯失头夷夸夹夺夾奄奇奈奉奋奎奏奐契奔奕奖套奘奚奠奢奥奧奩奪奭奮女奴奶奸她好妁如妃妄妆妇妈妊妍妒妓妖妙妝妞妣妤妥妨妪妮妯妳妹妻妾姅姆姊始姍姐姑姒姓委姗姘姚姜姣姥姦姨姪姬姹姻姿威娃娄娅娇娉娌娑娓娘娛娜娟娠娣娥娩娱娴娶娼婀婁婆婉婊婚婢婦婪婴婶婷婺婿媒媚媛媧媲媳媼媽媾嫁嫂嫉嫌嫔嫖嫗嫘嫡嫣嫦嫩嫵嫻嬈嬉嬋嬌嬝嬤嬪嬰嬴嬸子孑孓孔孕字存孙孚孛孜孝孟季孤学孩孪孫孬孰孱孳孵學孺孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝实宠审客宣室宥宦宪宫宮宰害宴宵家宸容宽宾宿寀寂寄寅密寇富寐寒寓寘寝寞察寡寢寤寥實寧寨審寫寬寮寰寸对寺寻导寿封射将將專尉尊尋對導小少尔尖尘尚尛尝尢尤尧尬就尴尷尸尹尺尼尽尾尿局屁层居屆屈屉届屋屌屍屎屏屐屑展屘屜屝属屠屡屢層履屨屯山屹屿岁岂岌岐岑岔岖岗岙岚岛岡岧岩岫岬岭岱岳岷岸岿峋峒峙峡峣峥峦峨峪峭峰峴島峻峽崁崆崇崎崑崔崖崗崙崛崢崤崧崩崭崮崴崽嵇嵌嵐嵘嵩嵯嶂嶄嶇嶔嶙嶝嶸嶺嶼嶽巅巍川州巡巢工左巧巨巩巫差己已巳巴巷巽巾币市布帅帆师希帐帑帕帖帘帙帚帛帜帝帟帥带帧師席帮帳帶帷常帼帽幀幃幄幅幌幔幕幗幛幟幡幢幣幫干平年并幸幹幺幻幼幽幾广庄庆庇床序庐库应底庖店庙庚府庞废庠度座庫庭庵庶康庸庾廁廂廄廈廉廊廓廖廚廛廝廟廠廢廣廬延廷建廾廿开弁异弃弄弈弊弋式弑弒弓弔引弗弘弛弟张弥弦弧弩弭弯弱張強弹强弼彀彆彈彊彌归当录彗彙彝形彤彥彦彩彪彫彬彭彰影彷役彻彼彿往征径待徇很徉徊律後徐徑徒得徘徙徜從徠御徨復循徬徭微徴徵德徹徽心必忆忌忍忏忐忑忖志忘忙忝忠忡忧忪快忬忱念忸忻忽忾忿怀态怂怃怅怆怎怏怒怔怕怖怛怜思怠怡急怦性怨怩怪怫怯怵总恂恃恆恋恍恐恒恕恙恢恣恤恥恨恩恪恫恬恭息恰恳恶恹恺恻恼恿悄悅悉悌悍悔悖悚悟悠患悦您悫悬悯悲悴悵悶悸悻悼悽情惆惇惊惋惑惕惘惚惜惟惠惡惦惧惨惩惫惬惭惮惯惰惱想惴惶惹惺惻愀愁愆愈愉愍愎意愒愕愚愛愜感愣愤愧愫愬愴愷愾愿慄慇慈態慌慍慎慑慕慘慚慝慟慢慣慧慨慫慮慰慵慶慷慼慾憂憊憋憎憐憑憔憚憤憧憨憩憫憬憮憲憶憾懂懇懈應懊懋懍懑懒懣懦懲懵懶懷懿戈戊戌戍戎戏成我戒戕或战戚戛戟戡戢截戮戰戲戳戴戶户戾房所扁扇扈扉手才扎扑扒打扔托扛扣执扩扪扫扬扭扮扯扰扳扶批扼找承技抄抆抉把抑抒抓抔投抖抗折抚抛抠抡抢护报抨披抬抱抵抹抻押抽抿拂拄担拆拇拈拉拊拋拌拍拎拐拒拓拔拖拗拘拙拚招拜拟拢拣拥拦拧拨择括拭拮拯拱拳拴拷拼拽拾拿持挂指挈按挎挑挖挚挛挞挟挠挡挣挤挥挨挪挫振挲挺挽挾捂捅捆捉捋捌捍捎捏捐捕捞损捡换捣捧捨捩捫捭据捯捱捲捶捷捺捻掀掂掃掄授掉掌掏掐排掖掘掙掛掠採探掣接控推掩措掬掰掳掴掷掸掺揀揄揆揉揍描提插揖揚換握揣揩揪揭揮援揹揽搀搁搂搅搆損搏搐搓搔搖搗搜搞搡搪搬搭搴搶携搽搾摁摄摆摇摈摊摑摒摔摘摞摟摧摩摭摯摸摹摺摻撂撅撇撈撐撑撒撓撕撙撚撞撢撤撥撩撫撬播撮撰撲撳撵撷撸撻撼撾撿擁擂擄擅擇擊擋操擎擒擔擘據擞擠擢擤擦擬擭擰擱擲擴擷擺擻擾攀攆攒攘攢攥攫支收攸改攻放政故效敉敌敏救敔敕敖敗敘教敛敝敞敢散敦敬数敲整敵敷數斂斃文斋斌斐斑斓斗料斛斜斟斡斤斥斧斩斫斬断斯新斷方於施旁旅旋旌旎族旖旗无既日旦旧旨早旬旭旱时旷旺昀昂昆昇昊昌明昏易昔昕昖昙星映昤春昧昨昭是昱昶昺昼显晁時晃晅晉晋晌晏晒晓晔晕晖晗晚晝晞晟晤晦晨普景晰晴晶晷智晾暂暄暇暈暉暍暑暖暗暘暝暢暧暨暫暮暱暴暸暹曄曆曇曉曌曖曙曜曝曠曦曰曲曳更曷書曹曼曾替最會月有朋服朐朔朕朗望朝期朦木未末本札朮术朱朴朵机朽杀杂权杆杉李杏材村杓杖杗杜杞束杠条来杨杪杭杯杰東杲杳杵杷杼松板极构枇枉枋析枓枕林枚果枝枢枣枪枫枭枯枰枴架枷枸柄柏某柑柒染柔柙柚柜柝柞柠柢查柩柬柯柱柳柴柵柿栅标栈栉栋栏树栓栖栗栘校栩株样核根格栽栾桀桁桂桃桅框案桌桎桐桑桓桔桢档桥桧桨桩桶桿梁梂梃梅梆梏梓梔梗條梟梡梢梦梧梨梭梯械梱梳梵检棂棄棉棋棍棒棕棗棘棚棟棠棣棧森棱棲棵棹棺棻椁椅植椎椒椟椰楂楄楊楓楔楚楛楝楞楠楣楨楫業楮楯極楷楹楼概榆榉榊榑榔榕榛榜榣榦榨榫榭榮榴榷榻槁槃構槌槍槐槓槛槟槨槭槳槽樁樂樅樊樑樓樘標樞樟模樣横樯樱樵樸樹樺樽樾橄橇橈橋橓橘橙橚橞機橡橢橫橱橹橾檀檄檐檔檗檜檠檢檣檬檮檯檳檸檻櫂櫃櫓櫚櫛櫝櫥欠次欢欣欤欧欲欸欺欽款歆歇歉歌歎歐歙歜歟止正此步武歧歪歲歷歸歹死歼歿殃殄殆殇殉殊残殍殒殖殘殡殤殮殯殴段殷殺殼殿毀毁毂毅毆毋母每毒毓比毕毖毗毙毚毛毡毫毬毯毽氅氈氏氐民氓气氖氛氟氣氤氦氧氨氫氬氮氯氳水永氾汀汁求汇汉汍汎汐汕汗汙汛汝汞江池污汤汨汩汪汰汲汴汶汹決汽汾沁沂沃沅沆沈沉沌沍沏沐沒沓沔沖沘沙沛沟没沥沦沧沪沫沬沮沱河沸油治沼沽沾沿況泄泅泉泊泌泓法泖泗泛泜泞泠泡波泣泥注泪泯泰泱泳泵泸泻泼泽泾洁洋洌洎洒洗洛洞津洧洩洪洫洮洱洲洵洶洸洹活洼洽派流浃浅浆浇浊测济浏浑浒浓浙浚浠浣浥浦浩浪浬浮浴海浸浹涂涅涇消涉涊涌涎涓涔涕涛涝涟涠涡涣涤润涧涨涩涪涮涯液涵涸涼涿淀淄淅淆淇淋淌淑淒淖淘淙淚淝淞淡淤淦淨淪淫淬淮深淳淵混淹淺添淼清渊渌渍渎渐渔渗渙渚減渝渠渡渣渤渥渦温測渭港渲渴游渺渾湃湄湊湍湎湔湖湘湛湟湣湧湩湮湯湲湾湿溃溅溉源準溘溜溝溢溥溧溪溫溯溴溶溺溼滁滂滄滅滇滉滋滌滑滓滔滕滚滞满滢滤滥滦滨滩滬滯滲滴滷滹滾滿漁漂漆漉漏漓演漕漠漢漣漩漪漫漬漱漲漳漶漸漾漿潇潑潔潘潛潜潟潠潢潤潦潭潮潯潰潴潸潺潼澀澄澆澈澎澗澜澠澡澤澦澧澱澳澴澶澹激濁濂濃濒濕濘濙濛濟濠濡濤濩濫濬濮濯濰濱濺濾瀆瀉瀋瀏瀑瀕瀘瀚瀝瀨灌火灭灯灰灵灶灸灼災灾灿炀炆炉炊炎炒炕炖炙炜炝炤炫炬炭炮炯炳炷炸点為炼炽烁烂烈烊烏烘烙烛烟烤烦烧烨烩烫烬热烯烹烽焉焊焐焕焖焘焙焚焜無焦焰然煅煆煉煌煎煖煙煜煞煤煥煦照煨煩煬煮煲煳煸煽熄熊熏熒熔熙熜熟熠熨熬熱熹熾燃燄燈燉燎燐燒燕燙燜營燠燥燦燧燬燭燮燴燸燹燻燼燾爆爌爍爪爬爭爰爱爵父爷爸爹爺爻爽爾爿牆片版牌牍牒牖牘牙牛牝牟牠牡牢牤牦牧物牯牲牴牵特牺牽牾犀犁犄犊犒犖犛犟犢犬犯状犷犹狀狂狄狈狎狐狗狙狞狠狡狩独狭狮狰狱狲狷狸狹狼狽猁猎猓猕猖猗猙猛猜猝猞猢猥猩猪猫猬献猴猶猷猾猿獄獅獎獐獒獗獠獨獭獰獲獵獷獸獺獾玄玆率玉王玖玘玛玟玠玥玨玩玫环现玲玳玷玺玻珀珅珊珍珏珑珙珞珠珣珥珪班珮珲珵珽現球琅理琉琊琍琏琐琛琢琥琦琨琪琮琯琳琴琵琶琺琼琿瑁瑄瑕瑗瑙瑚瑛瑜瑞瑟瑣瑤瑩瑪瑭瑯瑰瑶瑾璀璁璃璋璐璘璜璞璟璣璦璧璨璩環璽璿瓊瓛瓜瓠瓢瓣瓤瓦瓮瓶瓷甄甌甍甕甘甚甜生甡產甥甦用甩甫甬甭田由甲申电男甸画甽畅畋界畎畏畔留畚畜畝畢略畦番畫異畴當畸畿疆疇疋疏疑疗疙疚疝疡疢疣疤疥疫疮疯疱疲疳疴疵疸疹疼疽疾痂病症痈痉痊痍痒痔痕痘痙痛痞痠痢痣痤痨痪痰痱痲痳痴痹痺痿瘀瘁瘉瘋瘍瘓瘟瘠瘡瘢瘤瘦瘧瘩瘪瘫瘴瘸瘺瘾療癆癌癒癖癘癞癟癡癢癫癯癸登發白百皂的皆皇皈皋皎皑皓皖皙皚皞皦皮皰皱皴皺皿盂盃盅盆盈益盍盎盏盐监盒盔盖盗盘盛盜盞盟盡監盤盥盧盪目盯盲直相盹盼盾省眇眈眉看真眠眨眩眬眯眶眷眸眺眼眾眿着睁睃睏睑睛睜睞睡睢督睥睦睨睪睫睬睹睽睿瞄瞅瞇瞋瞌瞎瞑瞒瞞瞟瞠瞥瞧瞩瞪瞬瞭瞰瞳瞻瞼瞽瞿矇矗矛矜矢矣知矩矫短矮矯石矶矻矽矾矿码砂砌砍砒研砖砚砝砟砠砣砥砧砭砰砲破砷砸砺砾础硃硌硎硕硝硫硬确硯硼硿碉碌碍碎碑碓碗碘碜碟碣碧碩碰碳碴確碼碽碾磁磅磊磋磐磕磚磧磨磬磯磴磷磺礁礎礙礦礪示礼社祀祁祆祇祈祉祐祕祖祗祚祝神祟祠祥票祭祯祷祸祺祿禀禁禄禅禍禎福禛禦禧禪禮禱禹禺离禽禾禿秀私秃秈秉秋种科秒秘租秣秤秦秧秩积称秸移秽稀稅稈程稍税稔稗稚稜稞稟稠稣種稱稳稷稻稼稽稿穀穆穋穌積穎穗穠穡穢穩穫穴究穷穹空穿突窃窄窈窍窑窒窕窖窗窘窜窝窟窠窥窦窩窪窮窯窺窿竄竅立竑竖站竞竟章竣童竭端竹竺竽竿笃笆笈笊笋笏笑笔笙笛笞笠符笨第笮笳笼筅筆等筋筍筏筐筑筒答策筛筝筠筧筮筱筵筷筹签简箄箇箋箍箏箓箔箕算箝箠管箧箩箪箫箭箱箴箸節篁範篆篇築篌篑篓篙篛篝篠篡篤篦篩篮篱篷篾簇簌簍簏簑簞簡簣簧簪簸簽簾簿籁籍米类籽粉粑粒粕粗粘粝粟粤粥粪粮粱粲粳粵粹粼粽精糅糊糌糕糖糙糜糝糞糟糠糢糧糨糯糸系糾紀紂約紅紆紇紉紊紋納紐純紕紗紙級紛紜素紡索紧紫紮累細紱紲紳紹紼絀終絃組絆結絕絛絞絡絢給絨絮絰統絲絳絹綁綎綏綑經綜綞綠綢綬維綰綱網綴綵綸綺綻綽綾綿緇緊緒緘緙線緝緞締緣編緩緬緯緲練緹緻縈縉縊縐縑縛縝縞縣縫縮縯縱縲縴縵縷縹總績縿繁繃繅繆繇繈繒織繕繙繚繞繩繪繫繭繳繹纂纛纠红纣纤纥约级纨纪纬纭纮纯纰纱纲纳纵纶纷纸纹纺纽线练组绅细织终绉绊绌绍绎经绐绑绒结绔绕绘给绚络绝绞统绢绣绥继绩绪续绮绯绰绳维绵绷绸综绽绾绿缀缁缄缅缆缇缈缉缎缓缔缕编缘缙缚缛缜缝缟缠缢缤缥缨缩缪缭缮缰缴缶缸缺缽罄罈罐网罔罕罗罚罟罡罢罩罪置罰署罵罷罹羁羅羊羋羌美羔羚羞羡群羨義羯羲羶羸羹羼羽羿翀翁翅翊翌翎習翔翕翘翟翠翡翦翩翮翰翱翳翹翻翼耀老考耄者耆耋而耍耐耑耒耕耗耘耙耜耦耨耳耶耷耸耻耽耿聂聆聊聋职聒联聖聘聚聞聩聪聯聰聱聲聳聶職聿肃肄肅肆肇肉肋肌肓肖肘肚肛肝肠股肢肤肥肩肪肫肮肯肱育肴肺肾肿胀胁胃胄胆背胎胖胚胛胜胝胞胡胤胥胧胪胫胭胯胰胱胳胴胶胸胺胼能脂脅脆脈脉脊脍脏脐脑脓脖脚脣脤脩脫脯脰脱脸脹脾腆腊腋腌腎腐腑腓腔腕腥腦腫腮腰腱腳腴腸腹腺腻腼腾腿膀膂膈膊膏膚膛膜膝膠膨膩膳膺膻膽膾膿臀臂臃臆臉臊臍臏臘臜臣臥臧臨自臬臭至致臺臻臼臾舀舂舅舆與興舉舊舌舍舐舒舔舛舜舞舟舢舨航舫般舰舱舵舶舷船艇艋艘艙艮良艰艱色艳艺艽艾节芋芍芒芙芜芝芟芣芥芦芬芭芯芰花芳芷芸芹芻芽芾苇苋苍苎苏苑苒苓苔苗苛苜苞苟苣若苦苧苯英苹茁茂范茄茅茆茉茎茏茔茕茗茜茧茨茫茬茱茲茴茵茶茸茹荀荃荆草荊荏荐荒荔荚荟荡荣荤荥荧荨荫药荷荸荻荼莅莆莉莊莎莒莓莖莘莞莠莢莧莫莱莲获莹莼莽菁菂菅菇菊菌菔菜菟菠菩華菰菱菲菴菸菽萃萄萇萊萋萌萍萎萝营萦萧萨萬萱萵萸萼落葆葉葑著葛葡董葦葩葫葬葭葱葵葷葺蒂蒋蒐蒗蒙蒜蒞蒯蒲蒸蒼蒿蓀蓄蓆蓉蓊蓋蓑蓓蓝蓟蓦蓬蓮蓿蔆蔑蔓蔔蔗蔚蔡蔣蔥蔬蔭蔼蔽蕃蕈蕉蕊蕙蕞蕨蕩蕪蕭蕲蕴蕾薄薇薊薑薔薛薜薦薨薩薪薮薯薰薺藉藍藏藐藓藕藝藤藥藩藪藷藹藺藻蘆蘇蘊蘋蘑蘸虎虏虐虑虔處虚虛虜虞號虧虫虬虱虹虺虻虽虾蚀蚁蚂蚊蚓蚕蚜蚣蚤蚩蚪蚯蚱蚵蚶蛀蛄蛆蛇蛉蛊蛋蛎蛐蛔蛙蛛蛞蛟蛤蛩蛭蛮蛰蛴蛹蛻蛾蜀蜂蜃蜆蜇蜈蜉蜊蜒蜓蜕蜗蜘蜚蜜蜡蜢蜥蜩蜴蜷蜻蜿蝇蝉蝌蝎蝓蝕蝗蝙蝠蝣蝦蝨蝴蝶蝸螂螃融螞螟螢螫螬螳螺螻蟀蟆蟈蟋蟑蟒蟠蟬蟯蟲蟹蟻蟾蠅蠕蠡蠢蠹血衅行衍術衔街衙衛衝衡衢衣补表衫衬衮衰衷衹衽衾袁袂袄袅袈袋袍袒袖袜袝袞袤被袭袱裁裂装裆裊裎裒裔裕裘裙補裝裟裡裤裨裯裱裳裴裸裹製裾褂複褊褐褒褓褕褚褛褡褥褪褫褲褴褶褸褻褽襁襄襖襞襟襠襤西要覃覆見規覓視覜覦親覬覲见观规觅视览觉觊觋觍觎觐觑角觔解触觴言訂訃計訊訌討訏訐訑訓訕訖託記訛訝訟訢訣訥訪設許訴訶診註証訾詁詆詐詔評詖詛詞詠詢詣試詨詩詫詬詭詮詰話該詳詹詻詼誅誇誉誌認誑誓誕誘誚語誠誡誣誤誥誦誧誨說誰課誶誹誼調諂諄談諉請諍諒論諛諜諦諧諫諭諮諱諳諶諷諸諺諼諾謀謁謂謄謇謊謎謐謗謙講謝謠謨謫謬謹譁譆譎譏識譙譚譜警譬计订讣认讥讦讧讨让讪训议讯记讲讳讴讶讷许讹论讼讽设访诀证诂诃评诅识诈诉诊诋词诏译试诗诘诚诛诜话诞诠诡询诣诤该详诧诨诩诫诬语误诰诱诲诳说诵请诸诺读诽课谀谁调谄谅谆谈谊谋谍谎谏谐谑谒谓谕谗谙谚谛谜谟谢谣谤谥谦谧谨谩谪谬谭谱谲谴谶谷谿豁豆豈豉豌豎豐豕豚象豢豪豫豬豭豳豹豺貂貉貊貌貍貓貝貞負財貢貧貨販貪貫責貯貲貳貴貶買貸費貼貽貿賀賁賂賃賄賅資賈賊賑賒賓賜賞賠賡賢賣賤賦質賬賭賴賸賺賻購賽贅贝贞负贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贴贵贷贸费贺贻贼贽贾贿赂赃资赅赈赊赋赌赍赎赏赐赓赔赖赘赚赛赝赞赠赡赢赣赤赦赧赫赭走赳赴赵赶起趁趄超越趋趔趕趙趟趣趨趱足趴趸趺趾趿跃跄跆跋跌跎跏跑跚跛距跟跡跤跦跨跪路跳践跶跷跺跻跼踉踊踌踏踐踝踞踟踡踢踩踪踫踮踱踴踵踹踽蹂蹄蹇蹈蹉蹊蹋蹑蹒蹕蹙蹚蹟蹣蹤蹦蹩蹬蹭蹰蹲蹴蹶蹺蹼蹿躁躂躇躉躏身躬躯躲躺軀車軋軌軍軏軒軔軛軟軸軻軼軾較載輊輒輓輔輕輛輜輝輞輟輥輦輩輪輯輳輸輻輾輿轂轄轅轉轎轔车轧轨轩转轮软轰轱轲轴轶轻载轿辂较辄辅辆辈辉辍辎辐辑输辔辕辖辗辘辙辛辜辞辟辣辦辨辩辫辭辰辱農边辽达迁迂迄迅迆过迈迎运近返还这进远违连迟迢迤迥迦迨迩迪迫迭述迴迷迸迹迺追退送适逃逅逆选逊逍透逐递途逕逖逗這通逛逝逞速造逡逢連逦逮逯週進逵逶逸逻逼逾遁遂遇遊運遍過遏遐遑遒道達違遗遘遙遛遜遝遞遠遢遣遥遨適遭遮遲遴遵遷選遺遼遽避邀邁邂邃還邇邈邊邋邑邓邕邝邢那邦邪邮邱邵邶邸邹邻郁郃郊郎郑郝郡郢郦郧部郭郵都郾鄂鄉鄒鄗鄘鄙鄞鄢鄧鄭鄰鄱鄴酉酊酋酌配酒酗酝酡酣酥酩酪酬酱酴酵酷酸酽酿醃醇醉醋醍醐醒醜醞醣醪醫醬醮醱醺釆采釉释里重野量釐金釗釘釙釜針釣釦釧釩釭釵鈇鈉鈍鈐鈑鈔鈕鈞鈣鈴鈷鈸鈹鈽鈾鈿鉀鉅鉉鉋鉍鉑鉗鉚鉛鉤鉴鉸鉻鉼銀銅銑銓銖銘銜銨銬銮銲銳銷銻銼鋁鋅鋇鋐鋒鋤鋪鋰鋸鋼錄錐錕錘錙錚錠錡錢錦錨錫錮錯錳錶鍊鍋鍍鍔鍚鍛鍥鍬鍰鍵鍾鎂鎊鎔鎖鎗鎘鎚鎡鎢鎬鎮鎰鎳鎸鏃鏈鏍鏑鏖鏗鏘鏜鏝鏟鏡鏢鏤鐇鑨鑫针钉钓钗钙钛钜钝钞钟钢钥钦钧钩钮钰钱钳钵钹钺钻钿铁铃铄铅铆铉铎铐铖铛铜铠铢铣铤铨铩铭铮铰铲铳银铸铺链铿销锁锃锄锅锈锉锋锏锐错锚锡锢锣锤锥锦锨锭键锯锲锵锸锹锻镀镂镆镇镌镍镐镔镖镗镚镜镢镣镰镳镶長长門閂閃閉開閎閏閑閒間閔閘閡閣閤閥閨閩閭閱閻闆闈闊闋闌闐闔闕闖關门闩闪闭问闯闲闳间闵闷闸闹闺闻闽闾阀阁阂阄阅阈阉阊阋阎阐阑阒阔阕阖阗阙阜队阡阪阬阮阱防阳阴阵阶阻阿陀陂附际陆陈陋陌降限陕陘陛陝陞陡院陣除陨险陪陬陰陲陳陴陵陶陷陸陽隄隅隆隊隋隍階随隐隔隕隘隙際障隧隨險隱隴隶隸隹隻难雀雁雄雅集雇雉雊雋雌雍雏雒雕雖雙雛雜雞離難雨雩雪雯雲雳零雷雹電雾需霄霆震霉霍霎霏霑霓霖霜霞霤霧霭霰露霸霹霾青靓靖静靛靜非靠靡面靦革靳靴靶靼鞅鞋鞍鞏鞑鞘鞠鞣鞦鞭韋韌韓韜韦韧韩韬韭音韵韶韹頁頂頃項順須頊頌預頑頒頓頗領頜頡頤頫頭頰頷頸頹頻顆題額顎顏顓願顛類页顶顷项顺须顽顾顿颀颁颂预颅领颇颈颉颊颌颍颐频颓颔颖颗题颛颜额颠颤風颯颱颳颶颺颼风飒飓飕飘飙飚飛飞食飢飧飩飪飭飯飲飴飼飽飾餃餅餉養餌餐餒餓餘餚餛餞餡館餮餵餽餾餿饅饉饕饥饨饪饬饭饮饯饰饱饲饵饶饷饺饼饿馁馄馅馆馈馊馋馍馏馐馑馒首香馥馨馬馭馮馱馳馴駁駐駑駒駕駙駛駝駟駢駭駱駿騁騎騖马驭驮驯驰驱驳驴驶驸驹驻驼驽驾驿骁骂骄骆骇骈骋验骏骐骑骗骚骜骞骟骠骡骢骤骥骧骨骯骰骷骸骼髁髅髓高髡髦髭髮髯髻鬃鬆鬍鬥鬧鬨鬲鬼魁魂魄魅魆魇魍魎魏魔魚魯魷鮑鮪鮫鮭鮮鯀鯈鯉鯊鯖鯛鯧鯨鯽鱼鱿鲁鲈鲍鲑鲜鲤鲨鳄鳅鳌鳖鳞鳥鳩鳳鳴鳶鴃鴆鴉鴒鴕鴛鴣鴦鴨鴻鴿鵑鵝鵠鵡鵪鵬鵲鶉鶣鸟鸠鸡鸢鸣鸥鸦鸭鸮鸯鸳鸽鸾鸿鹃鹄鹅鹊鹏鹜鹞鹤鹫鹭鹰鹳鹵鹿麂麈麋麒麓麗麟麥麦麩麴麻麼麾黃黄黍黎黏黑黔默黛黜黝點黠黩黯鼎鼓鼕鼠鼬鼻鼾齊齋齐齑齒齿龄龇龊龌龍龙龚龛龜龟！（），：；？ \ No newline at end of file +🎵~"#$%&'()*+,-_./0123456789:<=>@ABCDEFGHIJKLMNOPQRSTUVWYZ[]^abcdefghijklmnopqrstuvwxyz—“”…→①②、。「」【】一丁七万丈三上下不与丐丑专且丕世丘丙业丛东丝丞丟丢两严並丧个丫中丰串临丸丹为主丽举乃久么义之乌乍乎乏乐乒乓乔乖乘乙九乞也习乡书乩买乱乳乾亂了予争事二于亏云互亓五井亘亙亚些亞亟亡亢交亥亦产亨亩享京亭亮亲亳亵人亿什仁仃仄仅仆仇今介仍从仑仓仔仕他仗付仙仞仟代令以仨仪仫们仰仲仳件价任份仿企伉伊伋伍伎伏伐休伕众优伙会伞伟传伤伥伦伧伪伫伯估伴伶伸伺似伽佃但佇佈位低住佐佑体佔何佗余佚佛作佝佞佟你佣佥佩佬佯佰佳併佺佻佼佾使侃侄來侈例侍侏侑侖供依侠侣侥侦侧侨侩侮侯侵侶侷便係促俄俊俎俏俐俑俗俘俚保俞俟俠信俨俩俪俭修俯俱俳俶俸俺俾倀倆倉個倌倍倏們倒倔倖倘候倚倜借倡倣倥倦倨倩倪倫倭债值倾偃假偈偉偌偎偏偕做停健偬偭偯側偵偶偷偺偻偽偿傀傅傈傍傑傖傘備傚傢傥傧储傩催傭傯傲傳債傷傻傾僅僇僎像僑僕僖僚僥僧僩僭僮僱僳僵價僻儀儂億儅儆儈儉儋儐儒儔儕儘儛償儡優儲儳儿兀允元兄充兆兇先光克兌免兑兒兔兕兗党兜兢入內全兩八公六兮兰共关兴兵其具典兹养兼兽冀内冈冉冊册再冑冒冕冗写军农冠冢冤冥冪冬冯冰冲决况冶冷冻冽净凄准凉凋凌凍减凑凛凜凝几凡凤凭凯凰凱凳凶凸凹出击函凿刀刁刃分切刈刊刎刑划刖列刘则刚创初删判別刨利刪别刮到刳制刷券刹刺刻刽剁剂剃則削剋剌前剎剐剑剔剖剛剜剝剡剥剧剩剪副割剴創剷剽剿劂劃劇劈劉劊劍劑劓力劝办功加务劣动助努劫劬励劲劳劻劾势勁勃勇勉勋勒動勗勘務勛勝勞募勢勣勤勦勰勳勵勸勺勻勾勿匀包匆匈匍匏匐匕化北匙匝匠匡匣匪匮匯匱匹区医匾匿區十千卅升午卉半华协卑卒卓協单卖南博卜卞占卡卢卤卦卧卫卮卯印危即却卵卷卸卹卻卿厂厄厅历厉压厌厕厘厚厝原厢厥厦厨厩厭厮厲去县叁参參又叉及友双反发叔取受变叙叛叟叠叢口古句另叨叩只叫召叭叮可台叱史右叵叶号司叹叻叼叽吁吃各吆合吉吊吋同名后吏吐向吒吓吕吗吙君吝吞吟吠否吧吨吩含听吭吮启吱吳吴吵吶吸吹吻吼吾呀呂呃呆呈告呎呐呕呗员呛呜呢呦周呱呲味呵呶呷呸呻呼命咀咂咄咆咋和咎咏咐咒咔咕咖咙咚咛咝咣咤咦咧咨咩咪咫咬咯咱咳咸咻咽咿哀品哂哄哆哇哈哉响哎哐哑哒哓哗哝哟員哥哦哧哨哩哪哭哮哱哲哺哼哽唁唆唇唉唏唐唔唠唤唧唬售唯唰唱唳唷唸唾啁啃啄商啊問啕啖啗啜啞啟啡啣啤啥啦啧啪啬啰啷啸啻啼啾喀喂喃善喆喇喉喊喋喑喔喘喙喚喜喝喟喧喪喫喬單喱喲喳喷喻喽嗅嗆嗇嗉嗎嗐嗑嗒嗓嗔嗖嗙嗚嗜嗝嗟嗡嗣嗤嗥嗦嗨嗫嗬嗯嗶嗷嗽嗾嘀嘁嘆嘈嘉嘍嘎嘐嘔嘖嘗嘘嘚嘛嘟嘡嘩嘫嘭嘮嘯嘰嘱嘲嘴嘶嘹嘻嘿噌噎噓噔噗噘噙噜噢噤噥器噩噪噫噬噯噱噴噶噸噹噻噼嚀嚅嚇嚎嚏嚐嚓嚕嚣嚥嚮嚷嚼囊囔囚四囝回因团囤囪囫园困囱围囵固国图囿圃圄圆圈圉國圍園圓圖團土圣在圩圬圭圯地圳场圻圾址坂均坊坍坎坏坐坑块坚坛坝坞坟坠坡坤坦坨坩坪坳坷坼垂垃垄垆型垒垓垕垛垠垢垣垦垫垭垮埂埃埋城埔埚埜域埠埤執培基堂堅堆堉堊堑堕堙堝堠堡堤堪堯堰報場堵塊塋塌塑塒塔塗塘塚塞塢填塭塵塹塽塾墀境墅墉墊墓墙墜增墟墡墦墨墩墮墳墾壁壅壇壎壑壓壕壘壙壞壢壤士壬壮壯声壳壶壹壺壽处备复夏夔夕外夙多夜够夠夢夤夥大天太夫夭央夯失头夷夸夹夺夾奄奇奈奉奋奎奏奐契奔奕奖套奘奚奠奢奥奧奩奪奭奮女奴奶奸她好妁如妃妄妆妇妈妊妍妒妓妖妙妝妞妣妤妥妨妪妮妯妳妹妻妾姅姆姊始姍姐姑姒姓委姗姘姚姜姣姥姦姨姪姬姹姻姿威娃娄娅娇娉娌娑娓娘娛娜娟娠娣娥娩娱娴娶娼婀婁婆婉婊婚婢婦婪婴婶婷婺婿媒媚媛媧媲媳媼媽媾嫁嫂嫉嫌嫔嫖嫗嫘嫡嫣嫦嫩嫵嫻嬈嬉嬋嬌嬝嬤嬪嬰嬴嬸子孑孓孔孕字存孙孚孛孜孝孟季孤学孩孪孫孬孰孱孳孵學孺孽宁它宅宇守安宋完宏宕宗官宙定宛宜宝实宠审客宣室宥宦宪宫宮宰害宴宵家宸容宽宾宿寀寂寄寅密寇富寐寒寓寘寝寞察寡寢寤寥實寧寨審寫寬寮寰寸对寺寻导寿封射将將專尉尊尋對導小少尔尖尘尚尛尝尢尤尧尬就尴尷尸尹尺尼尽尾尿局屁层居屆屈屉届屋屌屍屎屏屐屑展屘屜屝属屠屡屢層履屨屯山屹屿岁岂岌岐岑岔岖岗岙岚岛岡岧岩岫岬岭岱岳岷岸岿峋峒峙峡峣峥峦峨峪峭峰峴島峻峽崁崆崇崎崑崔崖崗崙崛崢崤崧崩崭崮崴崽嵇嵌嵐嵘嵩嵯嶂嶄嶇嶔嶙嶝嶸嶺嶼嶽巅巍川州巡巢工左巧巨巩巫差己已巳巴巷巽巾币市布帅帆师希帐帑帕帖帘帙帚帛帜帝帟帥带帧師席帮帳帶帷常帼帽幀幃幄幅幌幔幕幗幛幟幡幢幣幫干平年并幸幹幺幻幼幽幾广庄庆庇床序庐库应底庖店庙庚府庞废庠度座庫庭庵庶康庸庾廁廂廄廈廉廊廓廖廚廛廝廟廠廢廣廬延廷建廾廿开弁异弃弄弈弊弋式弑弒弓弔引弗弘弛弟张弥弦弧弩弭弯弱張強弹强弼彀彆彈彊彌归当录彗彙彝形彤彥彦彩彪彫彬彭彰影彷役彻彼彿往征径待徇很徉徊律後徐徑徒得徘徙徜從徠御徨復循徬徭微徴徵德徹徽心必忆忌忍忏忐忑忖志忘忙忝忠忡忧忪快忬忱念忸忻忽忾忿怀态怂怃怅怆怎怏怒怔怕怖怛怜思怠怡急怦性怨怩怪怫怯怵总恂恃恆恋恍恐恒恕恙恢恣恤恥恨恩恪恫恬恭息恰恳恶恹恺恻恼恿悄悅悉悌悍悔悖悚悟悠患悦您悫悬悯悲悴悵悶悸悻悼悽情惆惇惊惋惑惕惘惚惜惟惠惡惦惧惨惩惫惬惭惮惯惰惱想惴惶惹惺惻愀愁愆愈愉愍愎意愒愕愚愛愜感愣愤愧愫愬愴愷愾愿慄慇慈態慌慍慎慑慕慘慚慝慟慢慣慧慨慫慮慰慵慶慷慼慾憂憊憋憎憐憑憔憚憤憧憨憩憫憬憮憲憶憾懂懇懈應懊懋懍懑懒懣懦懲懵懶懷懿戈戊戌戍戎戏成我戒戕或战戚戛戟戡戢截戮戰戲戳戴戶户戾房所扁扇扈扉手才扎扑扒打扔托扛扣执扩扪扫扬扭扮扯扰扳扶批扼找承技抄抆抉把抑抒抓抔投抖抗折抚抛抠抡抢护报抨披抬抱抵抹抻押抽抿拂拄担拆拇拈拉拊拋拌拍拎拐拒拓拔拖拗拘拙拚招拜拟拢拣拥拦拧拨择括拭拮拯拱拳拴拷拼拽拾拿持挂指挈按挎挑挖挚挛挞挟挠挡挣挤挥挨挪挫振挲挺挽挾捂捅捆捉捋捌捍捎捏捐捕捞损捡换捣捧捨捩捫捭据捯捱捲捶捷捺捻掀掂掃掄授掉掌掏掐排掖掘掙掛掠採探掣接控推掩措掬掰掳掴掷掸掺揀揄揆揉揍描提插揖揚換握揣揩揪揭揮援揹揽搀搁搂搅搆損搏搐搓搔搖搗搜搞搡搪搬搭搴搶携搽搾摁摄摆摇摈摊摑摒摔摘摞摟摧摩摭摯摸摹摺摻撂撅撇撈撐撑撒撓撕撙撚撞撢撤撥撩撫撬播撮撰撲撳撵撷撸撻撼撾撿擁擂擄擅擇擊擋操擎擒擔擘據擞擠擢擤擦擬擭擰擱擲擴擷擺擻擾攀攆攒攘攢攥攫支收攸改攻放政故效敉敌敏救敔敕敖敗敘教敛敝敞敢散敦敬数敲整敵敷數斂斃文斋斌斐斑斓斗料斛斜斟斡斤斥斧斩斫斬断斯新斷方於施旁旅旋旌旎族旖旗无既日旦旧旨早旬旭旱时旷旺昀昂昆昇昊昌明昏易昔昕昖昙星映昤春昧昨昭是昱昶昺昼显晁時晃晅晉晋晌晏晒晓晔晕晖晗晚晝晞晟晤晦晨普景晰晴晶晷智晾暂暄暇暈暉暍暑暖暗暘暝暢暧暨暫暮暱暴暸暹曄曆曇曉曌曖曙曜曝曠曦曰曲曳更曷書曹曼曾替最會月有朋服朐朔朕朗望朝期朦木未末本札朮术朱朴朵机朽杀杂权杆杉李杏材村杓杖杗杜杞束杠条来杨杪杭杯杰東杲杳杵杷杼松板极构枇枉枋析枓枕林枚果枝枢枣枪枫枭枯枰枴架枷枸柄柏某柑柒染柔柙柚柜柝柞柠柢查柩柬柯柱柳柴柵柿栅标栈栉栋栏树栓栖栗栘校栩株样核根格栽栾桀桁桂桃桅框案桌桎桐桑桓桔桢档桥桧桨桩桶桿梁梂梃梅梆梏梓梔梗條梟梡梢梦梧梨梭梯械梱梳梵检棂棄棉棋棍棒棕棗棘棚棟棠棣棧森棱棲棵棹棺棻椁椅植椎椒椟椰楂楄楊楓楔楚楛楝楞楠楣楨楫業楮楯極楷楹楼概榆榉榊榑榔榕榛榜榣榦榨榫榭榮榴榷榻槁槃構槌槍槐槓槛槟槨槭槳槽樁樂樅樊樑樓樘標樞樟模樣横樯樱樵樸樹樺樽樾橄橇橈橋橓橘橙橚橞機橡橢橫橱橹橾檀檄檐檔檗檜檠檢檣檬檮檯檳檸檻櫂櫃櫓櫚櫛櫝櫥欠次欢欣欤欧欲欸欺欽款歆歇歉歌歎歐歙歜歟止正此步武歧歪歲歷歸歹死歼歿殃殄殆殇殉殊残殍殒殖殘殡殤殮殯殴段殷殺殼殿毀毁毂毅毆毋母每毒毓比毕毖毗毙毚毛毡毫毬毯毽氅氈氏氐民氓气氖氛氟氣氤氦氧氨氫氬氮氯氳水永氾汀汁求汇汉汍汎汐汕汗汙汛汝汞江池污汤汨汩汪汰汲汴汶汹決汽汾沁沂沃沅沆沈沉沌沍沏沐沒沓沔沖沘沙沛沟没沥沦沧沪沫沬沮沱河沸油治沼沽沾沿況泄泅泉泊泌泓法泖泗泛泜泞泠泡波泣泥注泪泯泰泱泳泵泸泻泼泽泾洁洋洌洎洒洗洛洞津洧洩洪洫洮洱洲洵洶洸洹活洼洽派流浃浅浆浇浊测济浏浑浒浓浙浚浠浣浥浦浩浪浬浮浴海浸浹涂涅涇消涉涊涌涎涓涔涕涛涝涟涠涡涣涤润涧涨涩涪涮涯液涵涸涼涿淀淄淅淆淇淋淌淑淒淖淘淙淚淝淞淡淤淦淨淪淫淬淮深淳淵混淹淺添淼清渊渌渍渎渐渔渗渙渚減渝渠渡渣渤渥渦温測渭港渲渴游渺渾湃湄湊湍湎湔湖湘湛湟湣湧湩湮湯湲湾湿溃溅溉源準溘溜溝溢溥溧溪溫溯溴溶溺溼滁滂滄滅滇滉滋滌滑滓滔滕滚滞满滢滤滥滦滨滩滬滯滲滴滷滹滾滿漁漂漆漉漏漓演漕漠漢漣漩漪漫漬漱漲漳漶漸漾漿潇潑潔潘潛潜潟潠潢潤潦潭潮潯潰潴潸潺潼澀澄澆澈澎澗澜澠澡澤澦澧澱澳澴澶澹激濁濂濃濒濕濘濙濛濟濠濡濤濩濫濬濮濯濰濱濺濾瀆瀉瀋瀏瀑瀕瀘瀚瀝瀨灌火灭灯灰灵灶灸灼災灾灿炀炆炉炊炎炒炕炖炙炜炝炤炫炬炭炮炯炳炷炸点為炼炽烁烂烈烊烏烘烙烛烟烤烦烧烨烩烫烬热烯烹烽焉焊焐焕焖焘焙焚焜無焦焰然煅煆煉煌煎煖煙煜煞煤煥煦照煨煩煬煮煲煳煸煽熄熊熏熒熔熙熜熟熠熨熬熱熹熾燃燄燈燉燎燐燒燕燙燜營燠燥燦燧燬燭燮燴燸燹燻燼燾爆爌爍爪爬爭爰爱爵父爷爸爹爺爻爽爾爿牆片版牌牍牒牖牘牙牛牝牟牠牡牢牤牦牧物牯牲牴牵特牺牽牾犀犁犄犊犒犖犛犟犢犬犯状犷犹狀狂狄狈狎狐狗狙狞狠狡狩独狭狮狰狱狲狷狸狹狼狽猁猎猓猕猖猗猙猛猜猝猞猢猥猩猪猫猬献猴猶猷猾猿獄獅獎獐獒獗獠獨獭獰獲獵獷獸獺獾玄玆率玉王玖玘玛玟玠玥玨玩玫环现玲玳玷玺玻珀珅珊珍珏珑珙珞珠珣珥珪班珮珲珵珽現球琅理琉琊琍琏琐琛琢琥琦琨琪琮琯琳琴琵琶琺琼琿瑁瑄瑕瑗瑙瑚瑛瑜瑞瑟瑣瑤瑩瑪瑭瑯瑰瑶瑾璀璁璃璋璐璘璜璞璟璣璦璧璨璩環璽璿瓊瓛瓜瓠瓢瓣瓤瓦瓮瓶瓷甄甌甍甕甘甚甜生甡產甥甦用甩甫甬甭田由甲申电男甸画甽畅畋界畎畏畔留畚畜畝畢略畦番畫異畴當畸畿疆疇疋疏疑疗疙疚疝疡疢疣疤疥疫疮疯疱疲疳疴疵疸疹疼疽疾痂病症痈痉痊痍痒痔痕痘痙痛痞痠痢痣痤痨痪痰痱癔痲痳痴痹痺痿瘀瘁瘉瘋瘍瘓瘟瘠瘡瘢瘤瘦瘧瘩瘪瘫瘴瘸瘺瘾療癆癌癒癖癘癞癟癡癢癫癯癸登發白百皂的皆皇皈皋皎皑皓皖皙皚皞皦皮皰皱皴皺皿盂盃盅盆盈益盍盎盏盐监盒盔盖盗盘盛盜盞盟盡監盤盥盧盪目盯盲直相盹盼盾省眇眈眉看真眠眨眩眬眯眶眷眸眺眼眾眿着睁睃睏睑睛睜睞睡睢督睥睦睨睪睫睬睹睽睿瞄瞅瞇瞋瞌瞎瞑瞒瞞瞟瞠瞥瞧瞩瞪瞬瞭瞰瞳瞻瞼瞽瞿矇矗矛矜矢矣知矩矫短矮矯石矶矻矽矾矿码砂砌砍砒研砖砚砝砟砠砣砥砧砭砰砲破砷砸砺砾础硃硌硎硕硝硫硬确硯硼硿碉碌碍碎碑碓碗碘碜碟碣碧碩碰碳碴確碼碽碾磁磅磊磋磐磕磚磧磨磬磯磴磷磺礁礎礙礦礪示礼社祀祁祆祇祈祉祐祕祖祗祚祝神祟祠祥票祭祯祷祸祺祿禀禁禄禅禍禎福禛禦禧禪禮禱禹禺离禽禾禿秀私秃秈秉秋种科秒秘租秣秤秦秧秩积称秸移秽稀稅稈程稍税稔稗稚稜稞稟稠稣種稱稳稷稻稼稽稿穀穆穋穌積穎穗穠穡穢穩穫穴究穷穹空穿突窃窄窈窍窑窒窕窖窗窘窜窝窟窠窥窦窩窪窮窯窺窿竄竅立竑竖站竞竟章竣童竭端竹竺竽竿笃笆笈笊笋笏笑笔笙笛笞笠符笨第笮笳笼筅筆等筋筍筏筐筑筒答策筛筝筠筧筮筱筵筷筹签简箄箇箋箍箏箓箔箕算箝箠管箧箩箪箫箭箱箴箸節篁範篆篇築篌篑篓篙篛篝篠篡篤篦篩篮篱篷篾簇簌簍簏簑簞簡簣簧簪簸簽簾簿籁籍米类籽粉粑粒粕粗粘粝粟粤粥粪粮粱粲粳粵粹粼粽精糅糊糌糕糖糙糜糝糞糟糠糢糧糨糯糸系糾紀紂約紅紆紇紉紊紋納紐純紕紗紙級紛紜素紡索紧紫紮累細紱紲紳紹紼絀終絃組絆結絕絛絞絡絢給絨絮絰統絲絳絹綁綎綏綑經綜綞綠綢綬維綰綱網綴綵綸綺綻綽綾綿緇緊緒緘緙線緝緞締緣編緩緬緯緲練緹緻縈縉縊縐縑縛縝縞縣縫縮縯縱縲縴縵縷縹總績縿繁繃繅繆繇繈繒織繕繙繚繞繩繪繫繭繳繹纂纛纠红纣纤纥约级纨纪纬纭纮纯纰纱纲纳纵纶纷纸纹纺纽线练组绅细织终绉绊绌绍绎经绐绑绒结绔绕绘给绚络绝绞统绢绣绥继绩绪续绮绯绰绳维绵绷绸综绽绾绿缀缁缄缅缆缇缈缉缎缓缔缕编缘缙缚缛缜缝缟缠缢缤缥缨缩缪缭缮缰缴缶缸缺缽罄罈罐网罔罕罗罚罟罡罢罩罪置罰署罵罷罹羁羅羊羋羌美羔羚羞羡群羨義羯羲羶羸羹羼羽羿翀翁翅翊翌翎習翔翕翘翟翠翡翦翩翮翰翱翳翹翻翼耀老考耄者耆耋而耍耐耑耒耕耗耘耙耜耦耨耳耶耷耸耻耽耿聂聆聊聋职聒联聖聘聚聞聩聪聯聰聱聲聳聶職聿肃肄肅肆肇肉肋肌肓肖肘肚肛肝肠股肢肤肥肩肪肫肮肯肱育肴肺肾肿胀胁胃胄胆背胎胖胚胛胜胝胞胡胤胥胧胪胫胭胯胰胱胳胴胶胸胺胼能脂脅脆脈脉脊脍脏脐脑脓脖脚脣脤脩脫脯脰脱脸脹脾腆腊腋腌腎腐腑腓腔腕腥腦腫腮腰腱腳腴腸腹腺腻腼腾腿膀膂膈膊膏膚膛膜膝膠膨膩膳膺膻膽膾膿臀臂臃臆臉臊臍臏臘臜臣臥臧臨自臬臭至致臺臻臼臾舀舂舅舆與興舉舊舌舍舐舒舔舛舜舞舟舢舨航舫般舰舱舵舶舷船艇艋艘艙艮良艰艱色艳艺艽艾节芋芍芒芙芜芝芟芣芥芦芬芭芯芰花芳芷芸芹芻芽芾苇苋苍苎苏苑苒苓苔苗苛苜苞苟苣若苦苧苯英苹茁茂范茄茅茆茉茎茏茔茕茗茜茧茨茫茬茱茲茴茵茶茸茹荀荃荆草荊荏荐荒荔荚荟荡荣荤荥荧荨荫药荷荸荻荼莅莆莉莊莎莒莓莖莘莞莠莢莧莫莱莲获莹莼莽菁菂菅菇菊菌菔菜菟菠菩華菰菱菲菴菸菽萃萄萇萊萋萌萍萎萝营萦萧萨萬萱萵萸萼落葆葉葑著葛葡董葦葩葫葬葭葱葵葷葺蒂蒋蒐蒗蒙蒜蒞蒯蒲蒸蒼蒿蓀蓄蓆蓉蓊蓋蓑蓓蓝蓟蓦蓬蓮蓿蔆蔑蔓蔔蔗蔚蔡蔣蔥蔬蔭蔼蔽蕃蕈蕉蕊蕙蕞蕨蕩蕪蕭蕲蕴蕾薄薇薊薑薔薛薜薦薨薩薪薮薯薰薺藉藍藏藐藓藕藝藤藥藩藪藷藹藺藻蘆蘇蘊蘋蘑蘸虎虏虐虑虔處虚虛虜虞號虧虫虬虱虹虺虻虽虾蚀蚁蚂蚊蚓蚕蚜蚣蚤蚩蚪蚯蚱蚵蚶蛀蛄蛆蛇蛉蛊蛋蛎蛐蛔蛙蛛蛞蛟蛤蛩蛭蛮蛰蛴蛹蛻蛾蜀蜂蜃蜆蜇蜈蜉蜊蜒蜓蜕蜗蜘蜚蜜蜡蜢蜥蜩蜴蜷蜻蜿蝇蝉蝌蝎蝓蝕蝗蝙蝠蝣蝦蝨蝴蝶蝸螂螃融螞螟螢螫螬螳螺螻蟀蟆蟈蟋蟑蟒蟠蟬蟯蟲蟹蟻蟾蠅蠕蠡蠢蠹血衅行衍術衔街衙衛衝衡衢衣补表衫衬衮衰衷衹衽衾袁袂袄袅袈袋袍袒袖袜袝袞袤被袭袱裁裂装裆裊裎裒裔裕裘裙補裝裟裡裤裨裯裱裳裴裸裹製裾褂複褊褐褒褓褕褚褛褡褥褪褫褲褴褶褸褻褽襁襄襖襞襟襠襤西要覃覆見規覓視覜覦親覬覲见观规觅视览觉觊觋觍觎觐觑角觔解触觴言訂訃計訊訌討訏訐訑訓訕訖託記訛訝訟訢訣訥訪設許訴訶診註証訾詁詆詐詔評詖詛詞詠詢詣試詨詩詫詬詭詮詰話該詳詹詻詼誅誇誉誌認誑誓誕誘誚語誠誡誣誤誥誦誧誨說誰課誶誹誼調諂諄談諉請諍諒論諛諜諦諧諫諭諮諱諳諶諷諸諺諼諾謀謁謂謄謇謊謎謐謗謙講謝謠謨謫謬謹譁譆譎譏識譙譚譜警譬计订讣认讥讦讧讨让讪训议讯记讲讳讴讶讷许讹论讼讽设访诀证诂诃评诅识诈诉诊诋词诏译试诗诘诚诛诜话诞诠诡询诣诤该详诧诨诩诫诬语误诰诱诲诳说诵请诸诺读诽课谀谁调谄谅谆谈谊谋谍谎谏谐谑谒谓谕谗谙谚谛谜谟谢谣谤谥谦谧谨谩谪谬谭谱谲谴谶谷谿豁豆豈豉豌豎豐豕豚象豢豪豫豬豭豳豹豺貂貉貊貌貍貓貝貞負財貢貧貨販貪貫責貯貲貳貴貶買貸費貼貽貿賀賁賂賃賄賅資賈賊賑賒賓賜賞賠賡賢賣賤賦質賬賭賴賸賺賻購賽贅贝贞负贡财责贤败账货质贩贪贫贬购贮贯贰贱贲贴贵贷贸费贺贻贼贽贾贿赂赃资赅赈赊赋赌赍赎赏赐赓赔赖赘赚赛赝赞赠赡赢赣赤赦赧赫赭走赳赴赵赶起趁趄超越趋趔趕趙趟趣趨趱足趴趸趺趾趿跃跄跆跋跌跎跏跑跚跛距跟跡跤跦跨跪路跳践跶跷跺跻跼踉踊踌踏踐踝踞踟踡踢踩踪踫踮踱踴踵踹踽蹂蹄蹇蹈蹉蹊蹋蹑蹒蹕蹙蹚蹟蹣蹤蹦蹩蹬蹭蹰蹲蹴蹶蹺蹼蹿躁躂躇躉躏身躬躯躲躺軀車軋軌軍軏軒軔軛軟軸軻軼軾較載輊輒輓輔輕輛輜輝輞輟輥輦輩輪輯輳輸輻輾輿轂轄轅轉轎轔车轧轨轩转轮软轰轱轲轴轶轻载轿辂较辄辅辆辈辉辍辎辐辑输辔辕辖辗辘辙辛辜辞辟辣辦辨辩辫辭辰辱農边辽达迁迂迄迅迆过迈迎运近返还这进远违连迟迢迤迥迦迨迩迪迫迭述迴迷迸迹迺追退送适逃逅逆选逊逍透逐递途逕逖逗這通逛逝逞速造逡逢連逦逮逯週進逵逶逸逻逼逾遁遂遇遊運遍過遏遐遑遒道達違遗遘遙遛遜遝遞遠遢遣遥遨適遭遮遲遴遵遷選遺遼遽避邀邁邂邃還邇邈邊邋邑邓邕邝邢那邦邪邮邱邵邶邸邹邻郁郃郊郎郑郝郡郢郦郧部郭郵都郾鄂鄉鄒鄗鄘鄙鄞鄢鄧鄭鄰鄱鄴酉酊酋酌配酒酗酝酡酣酥酩酪酬酱酴酵酷酸酽酿醃醇醉醋醍醐醒醜醞醣醪醫醬醮醱醺釆采釉释里重野量釐金釗釘釙釜針釣釦釧釩釭釵鈇鈉鈍鈐鈑鈔鈕鈞鈣鈴鈷鈸鈹鈽鈾鈿鉀鉅鉉鉋鉍鉑鉗鉚鉛鉤鉴鉸鉻鉼銀銅銑銓銖銘銜銨銬銮銲銳銷銻銼鋁鋅鋇鋐鋒鋤鋪鋰鋸鋼錄錐錕錘錙錚錠錡錢錦錨錫錮錯錳錶鍊鍋鍍鍔鍚鍛鍥鍬鍰鍵鍾鎂鎊鎔鎖鎗鎘鎚鎡鎢鎬鎮鎰鎳鎸鏃鏈鏍鏑鏖鏗鏘鏜鏝鏟鏡鏢鏤鐇鑨鑫针钉钓钗钙钛钜钝钞钟钢钥钦钧钩钮钰钱钳钵钹钺钻钿铁铃铄铅铆铉铎铐铖铛铜铠铢铣铤铨铩铭铮铰铲铳银铸铺链铿销锁锃锄锅锈锉锋锏锐错锚锡锢锣锤锥锦锨锭键锯锲锵锸锹锻镀镂镆镇镌镍镐镔镖镗镚镜镢镣镰镳镶長长門閂閃閉開閎閏閑閒間閔閘閡閣閤閥閨閩閭閱閻闆闈闊闋闌闐闔闕闖關门闩闪闭问闯闲闳间闵闷闸闹闺闻闽闾阀阁阂阄阅阈阉阊阋阎阐阑阒阔阕阖阗阙阜队阡阪阬阮阱防阳阴阵阶阻阿陀陂附际陆陈陋陌降限陕陘陛陝陞陡院陣除陨险陪陬陰陲陳陴陵陶陷陸陽隄隅隆隊隋隍階随隐隔隕隘隙際障隧隨險隱隴隶隸隹隻难雀雁雄雅集雇雉雊雋雌雍雏雒雕雖雙雛雜雞離難雨雩雪雯雲雳零雷雹電雾需霄霆震霉霍霎霏霑霓霖霜霞霤霧霭霰露霸霹霾青靓靖静靛靜非靠靡面靦革靳靴靶靼鞅鞋鞍鞏鞑鞘鞠鞣鞦鞭韋韌韓韜韦韧韩韬韭音韵韶韹頁頂頃項順須頊頌預頑頒頓頗領頜頡頤頫頭頰頷頸頹頻顆題額顎顏顓願顛類页顶顷项顺须顽顾顿颀颁颂预颅领颇颈颉颊颌颍颐频颓颔颖颗题颛颜额颠颤風颯颱颳颶颺颼风飒飓飕飘飙飚飛飞食飢飧飩飪飭飯飲飴飼飽飾餃餅餉養餌餐餒餓餘餚餛餞餡館餮餵餽餾餿饅饉饕饥饨饪饬饭饮饯饰饱饲饵饶饷饺饼饿馁馄馅馆馈馊馋馍馏馐馑馒首香馥馨馬馭馮馱馳馴駁駐駑駒駕駙駛駝駟駢駭駱駿騁騎騖马驭驮驯驰驱驳驴驶驸驹驻驼驽驾驿骁骂骄骆骇骈骋验骏骐骑骗骚骜骞骟骠骡骢骤骥骧骨骯骰骷骸骼髁髅髓高髡髦髭髮髯髻鬃鬆鬍鬥鬧鬨鬲鬼魁魂魄魅魆魇魍魎魏魔魚魯魷鮑鮪鮫鮭鮮鯀鯈鯉鯊鯖鯛鯧鯨鯽鱼鱿鲁鲈鲍鲑鲜鲤鲨鳄鳅鳌鳖鳞鳥鳩鳳鳴鳶鴃鴆鴉鴒鴕鴛鴣鴦鴨鴻鴿鵑鵝鵠鵡鵪鵬鵲鶉鶣鸟鸠鸡鸢鸣鸥鸦鸭鸮鸯鸳鸽鸾鸿鹃鹄鹅鹊鹏鹜鹞鹤鹫鹭鹰鹳鹵鹿麂麈麋麒麓麗麟麥麦麩麴麻麼麾黃黄黍黎黏黑黔默黛黜黝點黠黩黯鼎鼓鼕鼠鼬鼻鼾齊齋齐齑齒齿龄龇龊龌龍龙龚龛龜龟！（），：；？ \ No newline at end of file diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 6ea673913..2fd2affe8 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -332,6 +332,10 @@ PrefabInstance: propertyPath: m_Name value: Body Module System objectReference: {fileID: 0} + - target: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8209014069305634267, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1472,7 +1476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: curLevel: 1 - heightY: 0.783 + heightY: 0.562 minY: 0.221 --- !u!61 &551825979 BoxCollider2D: diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 19e699a19..077d7cd79 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -1,3 +1,4 @@ +using System; using System.Linq; using AibisDream.Framework; using AibisDream.Kit; @@ -71,9 +72,15 @@ namespace AibisDream.FixSystem { heatMapController=transform.Find("HeatMapController").GetComponent(); } + Debug.Log("Register"); FixSystemCenter.SystemDic.Register(this); } + private void Start() + { + gameObject.SetActive(false); + } + /// /// 寻找最接近的Module /// diff --git a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs index 723fcfdc7..6a4996570 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs @@ -5,6 +5,62 @@ using UnityEngine; namespace AibisDream.FixSystem { + public struct BodyModuleToClinicCommand : ITransitionCommand + { + private const float FadeDuration = 0.5f; + + public IEnumerator Execute() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + + // 黑屏 + yield return MainUIController.Instance.FadeInSync(FadeDuration); + // 把线插回去 + bodyModuleSystem.ResetPlug(); + // 诊所显示 + clinicSystem.gameObject.SetActive(true); + // 关闭其他 + ITransitionCommand.SetBodyModuleSystemActive(false); + // 黑屏淡出 + yield return MainUIController.Instance.FadeOutSync(FadeDuration); + } + + public void SetArgs(string arg) + { + // 暂无参数 + } + } + + public struct EngineToClinicCommand : ITransitionCommand + { + private const float FadeDuration = 0.5f; + + public IEnumerator Execute() + { + var clinicSystem = FixSystemCenter.SystemDic.Get(); + var engineSystem = FixSystemCenter.SystemDic.Get(); + + // 盖上盖子 + yield return engineSystem.CloseCoverAsync(); + // 黑屏 + yield return MainUIController.Instance?.FadeInSync(FadeDuration); + // 相机归位 + CameraKit.Instance.ResetCamara(); + // 打开诊所 + clinicSystem.gameObject.SetActive(true); + // 关闭其他 + ITransitionCommand.SetBodyModuleSystemActive(false); + // 黑屏淡出 + yield return MainUIController.Instance?.FadeOutSync(FadeDuration); + } + + public void SetArgs(string arg) + { + // 无需参数 + } + } + public struct GearToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; @@ -74,6 +130,8 @@ namespace AibisDream.FixSystem CameraKit.Instance.ResetCamara(); // 打开诊所 clinicSystem.gameObject.SetActive(true); + // 关闭其他 + ITransitionCommand.SetBodyModuleSystemActive(false); // 黑屏淡出 yield return MainUIController.Instance.FadeOutSync(FadeDuration); } diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index 1b248fb2a..43162f233 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -13,9 +13,13 @@ namespace AibisDream.FixSystem public IEnumerator Execute() { var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); // 黑屏 yield return MainUIController.Instance.FadeInSync(FadeDuration); + + // 激活 + ITransitionCommand.SetBodyModuleSystemActive(true); // 加载BodyModuleSystem bodyModuleSystem.CurDataKey = _configName; bodyModuleSystem.Load(); @@ -47,18 +51,17 @@ namespace AibisDream.FixSystem public IEnumerator Execute() { - var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var clinicSystem = FixSystemCenter.SystemDic.Get(); var engineSystem = FixSystemCenter.SystemDic.Get(); // 黑屏 - yield return MainUIController.Instance.FadeInSync(FadeDuration); + yield return MainUIController.Instance?.FadeInSync(FadeDuration); + // 激活 + ITransitionCommand.SetBodyModuleSystemActive(true); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); - // 激活插线系统 - bodyModuleSystem.gameObject.SetActive(true); // 黑屏淡出 - yield return MainUIController.Instance.FadeOutSync(FadeDuration); + yield return MainUIController.Instance?.FadeOutSync(FadeDuration); // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); // 开启引擎玩法 @@ -120,8 +123,6 @@ namespace AibisDream.FixSystem public struct ClinicToGearCommand : ITransitionCommand { - private const float FadeDuration = 0.5f; - // 引擎相机设置 private static readonly Vector3 CameraPos = new(-1.09f, -0.07f, -10); private const float OrthographicSize = 1.6f; @@ -131,14 +132,12 @@ namespace AibisDream.FixSystem public IEnumerator Execute() { - var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var clinicSystem = FixSystemCenter.SystemDic.Get(); var gearSystem = FixSystemCenter.SystemDic.Get(); - + // 激活 + ITransitionCommand.SetBodyModuleSystemActive(true); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); - // 激活插线系统 - bodyModuleSystem.gameObject.SetActive(true); // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); // 开启引擎玩法 diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs index 839ce1f9a..1483e9173 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs @@ -20,35 +20,21 @@ namespace AibisDream.FixSystem public interface ITransitionCommand { + protected static void SetBodyModuleSystemActive(bool active) + { + var gearSystem = FixSystemCenter.SystemDic.Get(); + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + var engineSystem = FixSystemCenter.SystemDic.Get(); + + gearSystem?.gameObject.SetActive(active); + bodyModuleSystem?.gameObject.SetActive(active); + engineSystem?.gameObject.SetActive(active); + } + IEnumerator Execute(); void SetArgs(string arg); } - public struct BodyModuleToClinicCommand : ITransitionCommand - { - private const float FadeDuration = 0.5f; - - public IEnumerator Execute() - { - var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); - var clinicSystem = FixSystemCenter.SystemDic.Get(); - - // 黑屏 - yield return MainUIController.Instance.FadeInSync(FadeDuration); - // 把线插回去 - bodyModuleSystem.ResetPlug(); - // 诊所显示 - clinicSystem.gameObject.SetActive(true); - // 黑屏淡出 - yield return MainUIController.Instance.FadeOutSync(FadeDuration); - } - - public void SetArgs(string arg) - { - // 暂无参数 - } - } - public struct BodyModuleToEngineCommand : ITransitionCommand { // 引擎相机设置 @@ -113,33 +99,6 @@ namespace AibisDream.FixSystem } } - public struct EngineToClinicCommand : ITransitionCommand - { - private const float FadeDuration = 0.5f; - - public IEnumerator Execute() - { - var clinicSystem = FixSystemCenter.SystemDic.Get(); - var engineSystem = FixSystemCenter.SystemDic.Get(); - - // 盖上盖子 - yield return engineSystem.CloseCoverAsync(); - // 黑屏 - yield return MainUIController.Instance.FadeInSync(FadeDuration); - // 相机归位 - CameraKit.Instance.ResetCamara(); - // 打开诊所 - clinicSystem.gameObject.SetActive(true); - // 黑屏淡出 - yield return MainUIController.Instance.FadeOutSync(FadeDuration); - } - - public void SetArgs(string arg) - { - // 无需参数 - } - } - public struct BodyModuleToEyeCommand : ITransitionCommand { // 引擎相机设置 diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index b39afc2e3..445594294 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -49,7 +49,7 @@ namespace AibisDream.Framework { if (Input.GetKeyDown(KeyCode.K)) { - MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("Gear")); + MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("Engine")); } } } diff --git a/Assets/Scripts/MiniGame/Engine/AirGate.cs b/Assets/Scripts/MiniGame/Engine/AirGate.cs index 39ebe863d..b44640872 100644 --- a/Assets/Scripts/MiniGame/Engine/AirGate.cs +++ b/Assets/Scripts/MiniGame/Engine/AirGate.cs @@ -34,12 +34,12 @@ namespace AibisDream { float levelHeight = heightY / (_engineSystem.config.maxLevel - 1); var curY = levelHeight * curLevel + minY; - transform.position = new Vector3(transform.position.x, curY, transform.position.z); + transform.localPosition = new Vector3(transform.localPosition.x, curY, transform.localPosition.z); } private void SwitchAirLevel(float mouseY) { - mouseY -= minY; + mouseY -= minY + transform.parent.position.y; float levelHeight = heightY / _engineSystem.config.maxLevel; curLevel = (int)(mouseY / levelHeight); @@ -47,6 +47,12 @@ namespace AibisDream if (curLevel < 0) curLevel = 0; } + public void MoveToLevel(int level) + { + curLevel = level - 1; + UpdateTransform(); + } + public void StopMove() { _engineSystem.UpdateAirLevel(curLevel); diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 487820ef5..f0a8c7833 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -16,6 +16,7 @@ namespace AibisDream public static string DataPath = Application.streamingAssetsPath + "/LevelData/EngineSystem/"; private SpriteRenderer _cover; + private AirGate _airGate; [Header("系统配置")] [SerializeField] public EngineConfig config; [Header("系统数据")] [SerializeField] private EngineData engineData; @@ -33,12 +34,20 @@ namespace AibisDream { FixSystemCenter.SystemDic.Register(this); _cover = transform.Find("Cover").GetComponent(); + _airGate = transform.Find("Air Gate").GetComponent(); } private void Start() { engineData = new EngineData(config.invalidTime); + + // 初始档位置为2 + _airGate.MoveToLevel(2); DialogController.Instance?.SetVariable("$curAirLevel", 2); + engineData.UpdateAirLevel(1, config.maxLevel); // 内部档位从0计数，1就是2 + + gameObject.SetActive(false); + } private void Update() @@ -82,8 +91,8 @@ namespace AibisDream public void UpdateAirLevel(int curLevel) { engineData.UpdateAirLevel(curLevel, config.maxLevel); - DialogController.Instance.SetVariable("$curAirLevel", curLevel + 1); - DialogController.Instance.StartDialogNode("调整进气档位"); + DialogController.Instance?.SetVariable("$curAirLevel", curLevel + 1); + DialogController.Instance?.StartDialogNode("调整进气档位"); } /// diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index f1baf91de..65236c2ef 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -62,6 +62,8 @@ namespace AibisDream _shaftGraph = new ShaftGraph(shafts, panelShafts); _panel.gameObject.SetActive(false); + + gameObject.SetActive(false); } #endregion