diff --git a/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png b/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png new file mode 100644 index 00000000..0be3ee57 Binary files /dev/null and b/box1/Assets/Art/UI/b716da111285f820bbd446cbdadde11.png differ 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 b860e555..39111a1d 100644 Binary files a/box1/MiniTemplate/Datas/关卡事件.xlsx and b/box1/MiniTemplate/Datas/关卡事件.xlsx differ diff --git a/box1/MiniTemplate/Datas/道具随机组表.xlsx b/box1/MiniTemplate/Datas/道具随机组表.xlsx index 41e68384..1e409826 100644 Binary files a/box1/MiniTemplate/Datas/道具随机组表.xlsx and b/box1/MiniTemplate/Datas/道具随机组表.xlsx differ