From 5d79aac59113be81c52a2de8dc4844e3d3b0a767 Mon Sep 17 00:00:00 2001 From: oldpeper <96619050+oldpeper@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E5=8C=85=E8=B0=83=E6=95=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=92=8C=E8=A7=A3=E9=94=81=E6=AC=A1=E6=95=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/b716da111285f820bbd446cbdadde11.png | Bin 0 -> 4615 bytes .../b716da111285f820bbd446cbdadde11.png.meta | 153 ++ box1/Assets/Art/font/20000个汉字表.txt | 2 +- box1/Assets/Editor/StarkBuilderSetting.asset | 4 +- box1/Assets/Resources/Data/eventtype.json | 12 +- box1/Assets/Resources/Data/randomprop.json | 1570 ++++++++--------- box1/Assets/Script/GameManager.cs | 11 +- box1/Assets/Script/Map/MapManager.cs | 22 +- box1/MiniTemplate/Datas/关卡事件.xlsx | Bin 12979 -> 12972 bytes box1/MiniTemplate/Datas/道具随机组表.xlsx | Bin 13468 -> 13539 bytes 10 files changed, 951 insertions(+), 823 deletions(-) create mode 100644 box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png create mode 100644 box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png.meta diff --git a/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png b/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png new file mode 100644 index 0000000000000000000000000000000000000000..0be3ee5769e4af04e6d71c2277a9b0083a76b025 GIT binary patch literal 4615 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 literal 0 HcmV?d00001 diff --git a/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png.meta b/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png.meta new file mode 100644 index 00000000..8a688106 --- /dev/null +++ b/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: dcc8b7904eb363748bb2e375409b8b82 +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: 1 + 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: -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: 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: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: diff --git a/box1/Assets/Art/font/20000个汉字表.txt b/box1/Assets/Art/font/20000个汉字表.txt index 428345c3..ea1f1a44 100644 --- a/box1/Assets/Art/font/20000个汉字表.txt +++ b/box1/Assets/Art/font/20000个汉字表.txt @@ -46,5 +46,5 @@ 渐 渑 渒 渓 渔 渕 渖 渗 渘 渙 渚 減 渜 渝 渞 渟 渠 渡 渢 渣 渤 渥 渦 渧 渨 温 渪 渫 測 渭 渮 港 渰 渱 渲 渳 渴 渵 渶 渷 游 渹 渺 渻 渼 渽 渾 渿 湀 湁 湂 湃 湄 湅 湆 湇 湈 湉 湊 湋 湌 湍 湎 湏 湐 湑 湒 湓 湔 湕 湖 湗 湘 湙 湚 湛 湜 湝 湞 湟 湠 湡 湢 湣 湤 湥 湦 湧 湨 湩 湪 湫 湬 湭 湮 湯 湰 湱 湲 湳 湴 湵 湶 湷 湸 湹 湺 湻 湼 湽 湾 湿 満 溁 溂 溃 溄 溅 溆 溇 溈 溉 溊 溋 溌 溍 溎 溏 源 溑 溒 溓 溔 溕 準 溗 溘 溙 溚 溛 溜 溝 溞 溟 溠 溡 溢 溣 溤 溥 溦 溧 溨 溩 溪 溫 溬 溭 溮 溯 溰 溱 溲 溳 溴 溵 溶 溷 溸 溹 溺 溻 溼 溽 溾 溿 滀 滁 滂 滃 滄 滅 滆 滇 滈 滉 滊 滋 滌 滍 滎 滏 滐 滑 滒 滓 滔 滕 滖 滗 滘 滙 滚 滛 滜 滝 滞 滟 滠 满 滢 滣 滤 滥 滦 滧 滨 滩 滪 滫 滬 滭 滮 滯 滰 滱 滲 滳 滴 滵 滶 滷 滸 滹 滺 滻 滼 滽 滾 滿 漀 漁 漂 漃 漄 漅 漆 漇 漈 漉 漊 漋 漌 漍 漎 漏 漐 漑 漒 漓 演 漕 漖 漗 漘 漙 漚 漛 漜 漝 漞 漟 漠 漡 漢 漣 漤 漥 漦 漧 漨 漩 漪 漫 漬 漭 漮 漯 漰 漱 漲 漳 漴 漵 漶 漷 漸 漹 漺 漻 漼 漽 漾 漿 潀 潁 潂 潃 潄 潅 潆 潇 潈 潉 潊 潋 潌 潍 潎 潏 潐 潑 潒 潓 潔 潕 潖 潗 潘 潙 潚 潛 潜 潝 潞 潟 潠 潡 潢 潣 潤 潥 潦 潧 潨 潩 潪 潫 潬 潭 潮 潯 潰 潱 潲 潳 潴 潵 潶 潷 潸 潹 潺 潻 潼 潽 潾 潿 澀 澁 澂 澃 澄 澅 澆 澇 澈 澉 澊 澋 澌 澍 澎 澏 澐 澑 澒 澓 澔 澕 澖 澗 澘 澙 澚 澛 澜 澝 澞 澟 澠 澡 澢 澣 澤 澥 澦 澧 澨 澩 澪 澫 澬 澭 澮 澯 澰 澱 澲 澳 澴 澵 澶 澷 澸 澹 澺 澻 澼 澽 澾 澿 激 濁 濂 濃 濄 濅 濆 濇 濈 濉 濊 濋 濌 濍 濎 濏 濐 濑 濒 濓 濔 濕 濖 濗 濘 濙 濚 濛 濜 濝 濞 濟 濠 濡 濢 濣 濤 濥 濦 濧 濨 濩 濪 濫 濬 濭 濮 濯 濰 濱 濲 濳 濴 濵 濶 濷 濸 濹 濺 濻 濼 濽 濾 濿 瀀 瀁 瀂 瀃 瀄 瀅 瀆 瀇 瀈 瀉 瀊 瀋 瀌 瀍 瀎 瀏 瀐 瀑 瀒 瀓 瀔 瀕 瀖 瀗 瀘 瀙 瀚 瀛 瀜 瀝 瀞 瀟 瀠 瀡 瀢 瀣 瀤 瀥 瀦 瀧 瀨 瀩 瀪 瀫 瀬 瀭 瀮 瀯 瀰 瀱 瀲 瀳 瀴 瀵 瀶 瀷 瀸 瀹 瀺 瀻 瀼 瀽 瀾 瀿 灀 灁 灂 灃 灄 灅 灆 灇 灈 灉 灊 灋 灌 灍 灎 灏 灐 灑 灒 灓 灔 灕 灖 灗 灘 灙 灚 灛 灜 灝 灞 灟 灠 灡 灢 灣 灤 灥 灦 灧 灨 灩 灪 火 灬 灭 灮 灯 灰 灱 灲 灳 灴 灵 灶 灷 灸 灹 灺 灻 灼 災 灾 灿 炀 炁 炂 炃 炄 炅 炆 炇 炈 炉 炊 炋 炌 炍 炎 炏 炐 炑 炒 炓 炔 炕 炖 炗 炘 炙 炚 炛 炜 炝 炞 炟 炠 炡 炢 炣 炤 炥 炦 炧 炨 炩 炪 炫 炬 炭 炮 炯 炰 炱 炲 炳 炴 炵 炶 炷 炸 点 為 炻 炼 炽 炾 炿 烀 烁 烂 烃 烄 烅 烆 烇 烈 烉 烊 烋 烌 烍 烎 烏 烐 烑 烒 烓 烔 烕 烖 烗 烘 烙 烚 烛 烜 烝 烞 烟 烠 烡 烢 烣 烤 烥 烦 烧 烨 烩 烪 烫 烬 热 烮 烯 烰 烱 烲 烳 烴 烵 烶 烷 烸 烹 烺 烻 烼 烽 烾 烿 焀 焁 焂 焃 焄 焅 焆 焇 焈 焉 焊 焋 焌 焍 焎 焏 焐 焑 焒 焓 焔 焕 焖 焗 焘 焙 焚 焛 焜 焝 焞 焟 焠 無 焢 焣 焤 焥 焦 焧 焨 焩 焪 焫 焬 焭 焮 焯 焰 焱 焲 焳 焴 焵 然 焷 焸 焹 焺 焻 焼 焽 焾 焿 煀 煁 煂 煃 煄 煅 煆 煇 煈 煉 煊 煋 煌 煍 煎 煏 煐 煑 煒 煓 煔 煕 煖 煗 煘 煙 煚 煛 煜 煝 煞 煟 煠 煡 煢 煣 煤 煥 煦 照 煨 煩 煪 煫 煬 煭 煮 煯 煰 煱 煲 煳 煴 煵 煶 煷 煸 煹 煺 煻 煼 煽 煾 煿 熀 熁 熂 熃 熄 熅 熆 熇 熈 熉 熊 熋 熌 熍 熎 熏 熐 熑 熒 熓 熔 熕 熖 熗 熘 熙 熚 熛 熜 熝 熞 熟 熠 熡 熢 熣 熤 熥 熦 熧 熨 熩 熪 熫 熬 熭 熮 熯 熰 熱 熲 熳 熴 熵 熶 熷 熸 熹 熺 熻 熼 熽 熾 熿 燀 燁 燂 燃 燄 燅 燆 燇 燈 燉 燊 燋 燌 燍 燎 燏 燐 燑 燒 燓 燔 燕 燖 燗 燘 燙 燚 燛 燜 燝 燞 營 燠 燡 燢 燣 燤 燥 燦 燧 燨 燩 燪 燫 燬 燭 燮 燯 燰 燱 燲 燳 燴 燵 燶 燷 燸 燹 燺 燻 燼 燽 燾 燿 爀 爁 爂 爃 爄 爅 爆 爇 爈 爉 爊 爋 爌 爍 爎 爏 爐 爑 爒 爓 爔 爕 爖 爗 爘 爙 爚 爛 爜 爝 爞 爟 爠 爡 爢 爣 爤 爥 爦 爧 爨 爩 爪 爫 爬 爭 爮 爯 爰 爱 爲 爳 爴 爵 父 爷 爸 爹 爺 爻 爼 爽 爾 爿 牀 牁 牂 牃 牄 牅 牆 片 版 牉 牊 牋 牌 牍 牎 牏 牐 牑 牒 牓 牔 牕 牖 牗 牘 牙 牚 牛 牜 牝 牞 牟 牠 牡 牢 牣 牤 牥 牦 牧 牨 物 牪 牫 牬 牭 牮 牯 牰 牱 牲 牳 牴 牵 牶 牷 牸 特 牺 牻 牼 牽 牾 牿 犀 犁 犂 犃 犄 犅 犆 犇 犈 犉 犊 犋 犌 犍 犎 犏 犐 犑 犒 犓 犔 犕 犖 犗 犘 犙 犚 犛 犜 犝 犞 犟 犠 犡 犢 犣 犤 犥 犦 犧 犨 犩 犪 犫 犬 犭 犮 犯 犰 犱 犲 犳 犴 犵 状 犷 犸 犹 犺 犻 犼 犽 犾 犿 狀 狁 狂 狃 狄 狅 狆 狇 狈 狉 狊 狋 狌 狍 狎 狏 狐 狑 狒 狓 狔 狕 狖 狗 狘 狙 狚 狛 狜 狝 狞 狟 狠 狡 狢 狣 狤 狥 狦 狧 狨 狩 狪 狫 独 狭 狮 狯 狰 狱 狲 狳 狴 狵 狶 狷 狸 狹 狺 狻 狼 狽 狾 狿 猀 猁 猂 猃 猄 猅 猆 猇 猈 猉 猊 猋 猌 猍 猎 猏 -猐 猑 猒 猓 猔 猕 猖 猗 猘 猙 猚 猛 猜 猝 猞 猟 猠 猡 猢 猣 猤 猥 猦 猧 猨 猩 猪 猫 猬 猭 献 猯 猰 猱 猲 猳 猴 猵 猶 猷 猸 猹 猺 猻 猼 猽 猾 猿 獀 獁 獂 獃 獄 獅 獆 獇 獈 獉 獊 獋 獌 獍 獎 獏 獐 獑 獒 獓 獔 獕 獖 獗 獘 獙 獚 獛 獜 獝 獞 獟 獠 獡 獢 獣 獤 獥 獦 獧 獨 獩 獪 獫 獬 獭 獮 獯 獰 獱 獲 獳 獴 獵 獶 獷 獸 獹 獺 獻 獼 獽 獾 獿 玀 玁 玂 玃 玄 玅 玆 率 玈 玉 玊 王 玌 玍 玎 玏 玐 玑 玒 玓 玔 玕 玖 玗 玘 玙 玚 玛 玜 玝 玞 玟 玠 玡 玢 玣 玤 玥 玦 玧 玨 玩 玪 玫 玬 玭 玮 环 现 玱 玲 玳 玴 玵 玶 玷 玸 玹 玺 玻 玼 玽 玾 玿 珀 珁 珂 珃 珄 珅 珆 珇 珈 珉 珊 珋 珌 珍 珎 珏 珐 珑 珒 珓 珔 珕 珖 珗 珘 珙 珚 珛 珜 珝 珞 珟 珠 珡 珢 珣 珤 珥 珦 珧 珨 珩 珪 珫 珬 班 珮 珯 珰 珱 珲 珳 珴 珵 珶 珷 珸 珹 珺 珻 珼 珽 現 珿 琀 琁 琂 球 琄 琅 理 琇 琈 琉 琊 琋 琌 琍 琎 琏 琐 琑 琒 琓 琔 琕 琖 琗 琘 琙 琚 琛 琜 琝 琞 琟 琠 琡 琢 琣 琤 琥 琦 琧 琨 琩 琪 琫 琬 琭 琮 琯 琰 琱 琲 琳 琴 琵 琶 琷 琸 琹 琺 琻 琼 琽 琾 琿 瑀 瑁 瑂 瑃 瑄 瑅 瑆 瑇 瑈 瑉 瑊 瑋 瑌 瑍 瑎 瑏 瑐 瑑 瑒 瑓 瑔 瑕 瑖 瑗 瑘 瑙 瑚 瑛 瑜 瑝 瑞 瑟 瑠 瑡 瑢 瑣 瑤 瑥 瑦 瑧 瑨 瑩 瑪 瑫 瑬 瑭 瑮 瑯 瑰 瑱 瑲 瑳 瑴 瑵 瑶 瑷 瑸 瑹 瑺 瑻 瑼 瑽 瑾 瑿 璀 璁 璂 璃 璄 璅 璆 璇 璈 璉 璊 璋 璌 璍 璎 璏 璐 璑 璒 璓 璔 璕 璖 璗 璘 璙 璚 璛 璜 璝 璞 璟 璠 璡 璢 璣 璤 璥 璦 璧 璨 璩 璪 璫 璬 璭 璮 璯 環 璱 璲 璳 璴 璵 璶 璷 璸 璹 璺 1234567890-+!@#$%^&*()?><;',/. +猐 猑 猒 猓 猔 猕 猖 猗 猘 猙 猚 猛 猜 猝 猞 猟 猠 猡 猢 猣 猤 猥 猦 猧 猨 猩 猪 猫 猬 猭 献 猯 猰 猱 猲 猳 猴 猵 猶 猷 猸 猹 猺 猻 猼 猽 猾 猿 獀 獁 獂 獃 獄 獅 獆 獇 獈 獉 獊 獋 獌 獍 獎 獏 獐 獑 獒 獓 獔 獕 獖 獗 獘 獙 獚 獛 獜 獝 獞 獟 獠 獡 獢 獣 獤 獥 獦 獧 獨 獩 獪 獫 獬 獭 獮 獯 獰 獱 獲 獳 獴 獵 獶 獷 獸 獹 獺 獻 獼 獽 獾 獿 玀 玁 玂 玃 玄 玅 玆 率 玈 玉 玊 王 玌 玍 玎 玏 玐 玑 玒 玓 玔 玕 玖 玗 玘 玙 玚 玛 玜 玝 玞 玟 玠 玡 玢 玣 玤 玥 玦 玧 玨 玩 玪 玫 玬 玭 玮 环 现 玱 玲 玳 玴 玵 玶 玷 玸 玹 玺 玻 玼 玽 玾 玿 珀 珁 珂 珃 珄 珅 珆 珇 珈 珉 珊 珋 珌 珍 珎 珏 珐 珑 珒 珓 珔 珕 珖 珗 珘 珙 珚 珛 珜 珝 珞 珟 珠 珡 珢 珣 珤 珥 珦 珧 珨 珩 珪 珫 珬 班 珮 珯 珰 珱 珲 珳 珴 珵 珶 珷 珸 珹 珺 珻 珼 珽 現 珿 琀 琁 琂 球 琄 琅 理 琇 琈 琉 琊 琋 琌 琍 琎 琏 琐 琑 琒 琓 琔 琕 琖 琗 琘 琙 琚 琛 琜 琝 琞 琟 琠 琡 琢 琣 琤 琥 琦 琧 琨 琩 琪 琫 琬 琭 琮 琯 琰 琱 琲 琳 琴 琵 琶 琷 琸 琹 琺 琻 琼 琽 琾 琿 瑀 瑁 瑂 瑃 瑄 瑅 瑆 瑇 瑈 瑉 瑊 瑋 瑌 瑍 瑎 瑏 瑐 瑑 瑒 瑓 瑔 瑕 瑖 瑗 瑘 瑙 瑚 瑛 瑜 瑝 瑞 瑟 瑠 瑡 瑢 瑣 瑤 瑥 瑦 瑧 瑨 瑩 瑪 瑫 瑬 瑭 瑮 瑯 瑰 瑱 瑲 瑳 瑴 瑵 瑶 瑷 瑸 瑹 瑺 瑻 瑼 瑽 瑾 瑿 璀 璁 璂 璃 璄 璅 璆 璇 璈 璉 璊 璋 璌 璍 璎 璏 璐 璑 璒 璓 璔 璕 璖 璗 璘 璙 璚 璛 璜 璝 璞 璟 璠 璡 璢 璣 璤 璥 璦 璧 璨 璩 璪 璫 璬 璭 璮 璯 環 璱 璲 璳 璴 璵 璶 璷 璸 璹 璺 1234567890-+!@#$%^&*()?><;',/.× 璻 璼 璽 璾 璿 瓀 瓁 瓂 瓃 瓄 瓅 瓆 瓇 瓈 瓉 瓊 瓋 瓌 瓍 瓎 瓏 瓐 瓑 瓒 瓓 瓔 瓕 瓖 瓗 瓘 瓙 瓚 瓛 瓜 瓝 瓞 瓟 瓠 瓡 瓢 瓣 瓤 瓥 瓦 瓧 瓨 瓩 瓪 瓫 瓬 瓭 瓮 瓯 瓰 瓱 瓲 瓳 瓴 瓵 瓶 瓷 瓸 瓹 瓺 瓻 瓼 瓽 瓾 瓿 甀 甁 甂 甃 甄 甅 甆 甇 甈 甉 甊 甋 甌 甍 \ No newline at end of file diff --git a/box1/Assets/Editor/StarkBuilderSetting.asset b/box1/Assets/Editor/StarkBuilderSetting.asset index a44c38f7..a449e795 100644 --- a/box1/Assets/Editor/StarkBuilderSetting.asset +++ b/box1/Assets/Editor/StarkBuilderSetting.asset @@ -16,7 +16,7 @@ MonoBehaviour: webGLOutputDir: E:/Project/apk/BoxDY useByteAudioAPI: 0 wasmMemorySize: 128 - isWebGL2: 0 + isWebGL2: 1 needCompress: 1 symbolMode: 1 profiling: 0 @@ -44,7 +44,7 @@ MonoBehaviour: a: tt2f5a59e7b06fb35a07 version: autoVersion: 0 - b: E:\Project\apk\BoxDY\webgl_package-20241107_143043.zip + b: E:\Project\apk\BoxDY\webgl_package-20241216_174547.zip c: 0 d: 0 e: 0 diff --git a/box1/Assets/Resources/Data/eventtype.json b/box1/Assets/Resources/Data/eventtype.json index 8e6fa808..2211c8b5 100644 --- a/box1/Assets/Resources/Data/eventtype.json +++ b/box1/Assets/Resources/Data/eventtype.json @@ -14,7 +14,7 @@ "Eventtype": 1, "Event1": 100, "Event2": 0, - "Time": 0, + "Time": 10, "Describe": 110011211, "Weight": 30, "Advertisement": 0 @@ -34,7 +34,7 @@ "Eventtype": 3, "Event1": 300, "Event2": 0, - "Time": 0, + "Time": 10, "Describe": 110011411, "Weight": 30, "Advertisement": 0 @@ -42,7 +42,7 @@ { "ID": 11001151, "Eventtype": 4, - "Event1": 10, + "Event1": 3, "Event2": 10000, "Time": 0, "Describe": 110011511, @@ -52,7 +52,7 @@ { "ID": 11001161, "Eventtype": 5, - "Event1": 10, + "Event1": 3, "Event2": 10, "Time": 0, "Describe": 110011611, @@ -62,7 +62,7 @@ { "ID": 11001171, "Eventtype": 6, - "Event1": 10, + "Event1": 3, "Event2": 20000, "Time": 0, "Describe": 110011711, @@ -72,7 +72,7 @@ { "ID": 11001181, "Eventtype": 7, - "Event1": 10, + "Event1": 3, "Event2": 10, "Time": 0, "Describe": 110011811, diff --git a/box1/Assets/Resources/Data/randomprop.json b/box1/Assets/Resources/Data/randomprop.json index e848d7c9..6eb17e45 100644 --- a/box1/Assets/Resources/Data/randomprop.json +++ b/box1/Assets/Resources/Data/randomprop.json @@ -4,24 +4,18 @@ "Propid": [ 1, 2, - 4, 6, - 7, 8, 9, - 11, - 14 + 11 ], "Typeweight": [ 60, 30, - 30, 60, 30, 30, - 30, - 30, - 30 + 20 ], "Proplevel": 4, "Levelweight": [ @@ -44,24 +38,20 @@ "Propid": [ 1, 2, - 4, + 3, 6, - 7, 8, 9, - 11, - 14 + 11 ], "Typeweight": [ 60, 30, - 30, + 15, 60, 30, 30, - 30, - 30, - 30 + 20 ], "Proplevel": 4, "Levelweight": [ @@ -85,25 +75,21 @@ 1, 2, 3, - 4, 6, 7, 8, 9, - 11, - 14 + 11 ], "Typeweight": [ - 40, - 20, - 10, - 20, + 60, + 30, + 15, 60, 30, 30, 30, - 30, - 30 + 20 ], "Proplevel": 4, "Levelweight": [ @@ -127,33 +113,23 @@ 1, 2, 3, - 4, - 5, 6, 7, 8, 9, 10, - 11, - 12, - 13, - 14 + 11 ], "Typeweight": [ + 60, 30, 20, - 20, - 10, - 20, - 20, - 20, - 10, - 30, - 30, + 60, 30, 20, + 60, 20, - 20 + 30 ], "Proplevel": 4, "Levelweight": [ @@ -177,33 +153,23 @@ 1, 2, 3, - 4, - 5, 6, 7, 8, 9, 10, - 11, - 12, - 13, - 14 + 11 ], "Typeweight": [ + 60, 30, 20, - 20, - 10, - 20, - 20, - 20, - 10, - 30, - 30, + 60, 30, 20, + 60, 20, - 20 + 30 ], "Proplevel": 4, "Levelweight": [ @@ -228,32 +194,26 @@ 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, - 12, - 13, - 14 + 12 ], "Typeweight": [ + 60, 30, - 20, - 20, - 10, - 20, - 20, - 20, - 10, + 15, + 30, + 60, 30, 30, 30, + 15, 20, - 20, - 20 + 30 ], "Proplevel": 4, "Levelweight": [ @@ -278,7 +238,6 @@ 2, 3, 4, - 5, 6, 7, 8, @@ -286,24 +245,21 @@ 10, 11, 12, - 13, - 14 + 13 ], "Typeweight": [ + 60, 30, - 20, - 20, - 10, - 20, - 20, - 20, - 10, + 15, + 30, + 60, 30, 30, 30, + 15, 20, - 20, - 20 + 30, + 10 ], "Proplevel": 4, "Levelweight": [ @@ -336,24 +292,22 @@ 10, 11, 12, - 13, - 14 + 13 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, - 20, - 10, - 20, - 20, - 20, - 10, + 60, 30, 30, 30, + 15, 20, - 20, - 20 + 30, + 10 ], "Proplevel": 4, "Levelweight": [ @@ -386,24 +340,22 @@ 10, 11, 12, - 13, - 14 + 13 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, - 20, - 10, - 20, - 20, - 20, - 10, + 60, 30, 30, 30, + 15, 20, - 20, - 20 + 30, + 10 ], "Proplevel": 4, "Levelweight": [ @@ -436,24 +388,22 @@ 10, 11, 12, - 13, - 14 + 13 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, - 20, - 10, - 20, - 20, - 20, - 10, + 60, 30, 30, 30, + 15, 20, - 20, - 20 + 30, + 10 ], "Proplevel": 4, "Levelweight": [ @@ -490,20 +440,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -540,20 +490,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -590,20 +540,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -640,20 +590,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -690,20 +640,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -740,20 +690,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -790,20 +740,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -840,20 +790,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -890,20 +840,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -940,20 +890,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -990,20 +940,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1040,20 +990,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1090,20 +1040,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1140,20 +1090,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1190,20 +1140,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1240,20 +1190,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1290,20 +1240,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1340,20 +1290,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1390,20 +1340,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1440,20 +1390,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1490,20 +1440,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1540,20 +1490,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1590,20 +1540,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1640,20 +1590,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1690,20 +1640,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1740,20 +1690,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1790,20 +1740,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1840,20 +1790,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1890,20 +1840,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1940,20 +1890,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -1990,20 +1940,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2040,20 +1990,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2090,20 +2040,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2140,20 +2090,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2190,20 +2140,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2240,20 +2190,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2290,20 +2240,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2340,20 +2290,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2390,20 +2340,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2440,20 +2390,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2490,20 +2440,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2540,20 +2490,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2590,20 +2540,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2640,20 +2590,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2690,20 +2640,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2740,20 +2690,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2790,20 +2740,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2840,20 +2790,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2890,20 +2840,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2940,20 +2890,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -2990,20 +2940,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3040,20 +2990,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3090,20 +3040,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3140,20 +3090,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3190,20 +3140,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3240,20 +3190,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3290,20 +3240,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3340,20 +3290,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3390,20 +3340,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3440,20 +3390,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3490,20 +3440,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3540,20 +3490,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3590,20 +3540,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3640,20 +3590,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3690,20 +3640,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3740,20 +3690,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3790,20 +3740,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3840,20 +3790,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3890,20 +3840,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ @@ -3940,20 +3890,20 @@ 14 ], "Typeweight": [ + 60, + 30, + 15, 30, 20, + 60, + 30, + 30, + 30, + 15, 20, + 30, 10, - 20, - 20, - 20, - 10, - 30, - 30, - 30, - 20, - 20, - 20 + 10 ], "Proplevel": 4, "Levelweight": [ diff --git a/box1/Assets/Script/GameManager.cs b/box1/Assets/Script/GameManager.cs index a0c1a400..cb9997e8 100644 --- a/box1/Assets/Script/GameManager.cs +++ b/box1/Assets/Script/GameManager.cs @@ -236,10 +236,15 @@ public class GameManager : MonoBehaviour { MapManager.ins.LockRayRest(stopGrid, seletUnlock.openData,out var bo); soundSystem.PlaceAudio(); + MapManager.ins.ResetRayLockGrid(); + MapManager.ins.LockAddData(); + MapManager.ins.RandomUnlock(); + } + else + { + MapManager.ins.ResetRayLockGrid(); + MapManager.ins.ResetUnlock(); } - MapManager.ins.ResetRayLockGrid(); - MapManager.ins.LockAddData(); - MapManager.ins.RandomUnlock(); seletUnlock = null; } if (seletObj!= null) diff --git a/box1/Assets/Script/Map/MapManager.cs b/box1/Assets/Script/Map/MapManager.cs index e5d6add2..720551ae 100644 --- a/box1/Assets/Script/Map/MapManager.cs +++ b/box1/Assets/Script/Map/MapManager.cs @@ -36,6 +36,10 @@ public class MapManager : MonoBehaviour public void InitLockData() { _unLockIndex = 0; + foreach (var variaGrid in _unLockGrids) + { + variaGrid.gameObject.SetActive(true); + } } public void LockAddData() @@ -92,8 +96,24 @@ public class MapManager : MonoBehaviour ResetLockGrid(); } + public void ResetUnlock() + { + foreach (var variaGrid in _unLockGrids) + { + variaGrid.transform.localPosition = Vector3.zero; + } + randomLockGrid.transform.position = unLockParent.position; + } public void RandomUnlock() { + if (_unLockIndex>=10) + { + foreach (var variaGrid in _unLockGrids) + { + variaGrid.gameObject.SetActive(false); + } + return; + } foreach (var variaGrid in _unLockGrids) { variaGrid.transform.localPosition = Vector3.zero; @@ -114,7 +134,7 @@ public class MapManager : MonoBehaviour List lockGrids = new List(); for (int i = 0; i < _unLockGrids.Count; i++) { - if (_unLockGrids[i].openData.Count<=2) + if (_unLockGrids[i].openData.Count ==2) { lockGrids.Add(_unLockGrids[i]); } diff --git a/box1/MiniTemplate/Datas/关卡事件.xlsx b/box1/MiniTemplate/Datas/关卡事件.xlsx index b860e5559070363e553c4e948dabf49c38e54461..39111a1d6eb4ca70a53850e23427f87254f35266 100644 GIT binary patch delta 3272 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