diff --git a/Assets/ManagedResources/Audio/GameAudioMixer.mixer b/Assets/ManagedResources/Audio/GameAudioMixer.mixer index 611ade34c2..c68daed38d 100644 --- a/Assets/ManagedResources/Audio/GameAudioMixer.mixer +++ b/Assets/ManagedResources/Audio/GameAudioMixer.mixer @@ -92,6 +92,7 @@ AudioMixerSnapshotController: cd318a70a881cfa4786d89d22553b9bc: -20 6023bf70993f48344b6ce9a8ab6e9c7c: 0 530c728060ac72748914c35aa7061ff3: 0 + b7969f9025520864fa43ec375c45fdfa: 0.135 c46735a0a081d594a8ad0e915faa1e21: -20 455637a07e9fb194e8e2d4ba3960f047: 0 11e655b0941615a46a78e83993debcdb: 0 @@ -100,13 +101,24 @@ AudioMixerSnapshotController: 3ccec6d094739b1468faccfa3ccb96d9: 0 137e79d03bcc9fc4795a137da130b2cb: 0 4e5cadd0a70d23d479285d22b0997997: 0 + a42c23e0b7e489746868462528e10fcc: -7796 e55c96e0081f0624e96ea39a1682dedb: -50 + 463d7fe003ff11f41bdbf2c7ab486744: -1546 + c868f1f06623b934daa3ad6bbc4487db: -7671 + 0fd27df00cebb464faa9230e0d83f30d: 6000 + 2e0a5b01e25e97e40adda17dcdc70623: 3.07 d651f521d1601984b9682a4b91165bc6: 0 e05ad82142928624882b52abbc613253: -40.900005 + 7ace89218f1b89d4c8916826943e3998: -5194 + 5e04ba31d22d9ee48ac9da6004b04dea: 0 + 8c74464177c85724480b91067e26b192: 0 64b6495189e42084f9eec2923e1652d0: 0.337 7700ad51ac9923b4aa834149d1470a5c: 1 8288e161ce2785e4c9dacc2e01732073: 0.23288238 + 53d575619b4e24540beca3284f6d4d00: -0.53 + d37c58613741ac644880474468f7bf4e: 53 c1171c71420f1c54e98f73f9a01fa59f: 20.7 + 430fda8181a0da844806c6bc27117614: 19560 a9a02391f81e004458dbf994e21def00: -8.841794 006053a1268283344b7ef7ff0da80ad9: 1 9e7a69b16215d204d86190e454e4df2e: -35 @@ -120,13 +132,17 @@ AudioMixerSnapshotController: a5339e72531768f4fa1a3037f7fc84fb: 1 bc10c382dc4b9e34e88a4d85c6031708: 0 62ce39a2a2045904aa687164ae9836d6: 10 + 61887da213acbe3468a36c60672d122c: 0.622 a81f36b28a0d65549873b2473ff56f42: 2 9f5d36c2cee7b2f4b8645f15bc45e441: -0 ea3631d2889d9d847b07bd33eec06299: 2 + bbef7dd28242668428240fb5ca023630: -4928 + caaf82f2e22dda643aa66b9a5afcffb8: 7852 8f2c73033f55ffb4aa45f1ed02bf5159: -20 2d8ff803b998b444191eeed8a71bc40d: 0.1 64deea13be177ff4ba1bdb3773aea935: -15 6b771e13170cebe459c0db5013933abb: -80 + 13269223651b24d46a752c56059a485d: 0.861 d4cf6d239688db9489e9b08aa3635707: 0 96192653e2bbffd40b3e0b77fbef46f6: -0.42426407 d110e753e0b0dff4d866396957ab69ef: 0 @@ -137,7 +153,9 @@ AudioMixerSnapshotController: 5fdde3930f020c4419c88d513fe51b5a: 0.1 d9770f9319712004fad8a9c7c8718ad3: 0 5d846bc3817bcc046801fa0696d6990e: 0 + c28c82d3afce2994aaf4e584cbee79d3: 19635 f7d7b5d3dd509244da9ddc6ca7818ae9: 0.3 + b6a846d35be694f4da28c0c133e6bfdb: 0.0168 2cbcbcd34ae56bd41ac140b874570338: 0 dae808f3b7fb1704898be5839d6d44d4: 0 99af3e0432f675d4ebde34607bf86584: 0 @@ -156,43 +174,66 @@ AudioMixerSnapshotController: 5789b7e4eba3f27408cf6114af5fad03: 1 b42aade4232bcd345b59f0f0ca5327a1: 2 99be6ee406263c14d867bcb8c7e1ce80: -20 + 0ee82ef48405c1d4f8fc03dde68ed525: 0.1 + 18d65f15f8b8d754bb245110d8a57659: 0.109 9ef71325ebb38bb43ab01c15771631bf: 0 + d6b654257b2e4154685fce566d225910: -7642 e3fc962566456814198249747aa429ea: -50 13fa3e2575722ad4f8512c8f0a071aa0: 10 - 266c9d3507bd287478652b4a24f500e7: 0.025578514 + 266c9d3507bd287478652b4a24f500e7: -1.5782816 18ba4055862295d4784be35911ec149d: -0 f5f4c9755f91d4c40b99658083184f28: -55 0f686f75b2ebdec4cbbc7eac8f0ed2b7: 0.01 + 4b8a2e850e24a6941a9dcab4977f047d: 0 4083e5956ec178142bc2d4c24ae26dc1: -50 + c80bd7a5692afa54aabc9a1132fe5caa: -4471 + f90bcdc5aef8ca048b84868e86e95250: 1 + 6b6610d568e87b74495d07460685c408: -1069 2f9463d587e41d34d9eea5f78c5f2ca0: -40 b1534ae555f2da546badd2eb4c9a16bb: 0.1 b93b5fe579aec044c81bae336166f001: 0 a98f43f52048d8d44a2a5cf6c2c2df6a: 0 + 83e9b806ae7f78740832eb385b87fb42: 79.8 b8869236876b87a4687ebbdf3b4ced52: 0 16e023562a5c8614694e6e3f42e97c4c: -0.27209902 7781546611684eb469f6deba6c726e83: 1124 6a218d6613daca74fba793d8d055e415: -4.560346 d6350f7613ed9d74ebaee028d6bed8ea: 0.3 + f53e59866f866244193117b49e1449d7: 0.672 8450eb86b7cad57438bfe7ac94268360: 0.1 - 016603c65dacd3440a0e202a6e1afa41: 20000 + aa42d1a62f33771458ec9ebea1cf8049: -7903 + 308a0fa69b5394649ab80565f2998fdb: 0.054 + 016603c65dacd3440a0e202a6e1afa41: 22000 475088c60c0531f41b33cfad444ca8ed: 0 9a3b3ad628d574348a5442457dc0ad11: 0.8 + 0bb64dd6de1a36f43b89c245f9256e01: -7387 945931e63ac0bad47a665a8fbca3b493: -60 + ce7018f67ed1c6948bf826a9f09d14e7: 0 + e7d77207f8e2d8f48bfd65a7cd634b30: 0.084 b16a58070fd906042a2e4d512e814a8c: 0.01 + 5e06ba07ed62fa24280b19e13563fe59: 100 41341e077f952c7418ae5ed61f33f658: 0 cbf53b279f195614d9b265d4e5842edf: -0.3976258 c9970e37bbf9e8d46a9afdc772aed464: 10.5 5d7f114794b28b642a8684d352483a3a: 0.13552582 + 2502d957993f9ce46abe4c5fbea6006b: 0.0391 + 813b2c57cb1c0b242a5e3475a5e78ac1: 4889 + 5a2cbe67c424dae489be0ba1badf5e35: 0.142 420def77f197f0144a4fbcee03b57f14: -60 d9fc8697962f0f840ba746829c3ba434: 1.072 + 8df02797b3fa1764288288bc89127555: -6369 f289bc9729dea8646b91d2b758094bf0: 0 15db66b7a61eb10499d16e0f90f77090: -20 876f18b722185b94cae0f4ed045c3da0: 0.5 4a57f0c7e2d0b9146a356a3f4ac17e97: 0 5a7bb1d70f3979045bba1193f5fa258f: -9.833286 + 0fba5ed7895b89942960ca3e815e0305: 0.0228 + 5aaff718afeba8d42b6cc6af7dda86ad: 3.07 6fd37e385186de64aa2d597eeb476df0: 0 b03ae058e6ef22242a60695c78572912: 0 7d817a688c3aca2409c3bfcd917f3890: 4.648096 + 9a27e388e9875a64b8add0d2b36b37d7: 0 + 338e0a88659e1a341a9339a11c4ffc76: -3691 adc817a8aab7d1442afcf14905eb193f: 10 38479ea820aa45a4da2928b175eca672: -60 5888eab8363fe914d8f85413f27db2b4: 10 @@ -201,9 +242,12 @@ AudioMixerSnapshotController: 821d64f86d8c8b34fbab85f48abe3350: 5 33344a1969095ae47b834995b70eab7c: 0 7c5bdf3931f106a47a3a4a49af1418ff: 0.1 + 1c1eab495e78a204585c2d1309f94e74: -7275 74883f59518611a45b2af1039cfb07e1: 10 e5870d69338e0874ea5927480385dc8c: -20 + b73902793eaee744fafe6c7887418b36: 0.027 551d94891824ecb4da16d7e214fe755c: -50 + f0e3c889cba0e944aae7d2c802fe77fa: 0 73418a99f7a427b4cb8190d1ff9eec64: 0 24b6f1a978286ca4f8d1890102fdf11c: 10 d30158a94cc7d3a4db6a57f171184efe: 1 @@ -212,65 +256,88 @@ AudioMixerSnapshotController: b6e618e9f47790d4099d88d48425fc0e: 0.1 22bd0ce940bf3d240a033d66ef8ed19a: 1 b26bd70afa002334aa5c85923cca1856: -19.928473 + a3eb880a58f88da4795c04efba54acb6: 0.052 a4de831af39174641a0dfc4168b8d024: -60 91f2b51a1237a26429c4bc4250fc77ef: 0.1 + 33a40e1af1881af4eb51d455e571934b: 0.0239 ccdef85a2676025419522775d3abe0d2: -20 6777969a6231ad249b1200a68f2980bb: -20 2b3d39aa38890bb4b8d6373849d96b77: 0 7e46aada3f7ae56459b18db9b94b83fa: 0 + e3342cdaeb206c745a71dd38e31247bf: 0.721 7864c5ea910d5c6408a7627c2bcbdf19: 1.7477665 b15b8dea0da50604f96b80fbfd2d2899: 0.3 020d8deae576cb44eba1bde7e2884b6c: 0.1 2a9faefa7b8ffb8459869dd398a2d7f9: 10 + e3d64b0b3b69c4644ba00d681034d4d0: 0 e0484b0b2b4dc2146afd120b85edf385: -20 8be2762be3f0f8541a054efea48e3514: 0 2a069b2b1ef5d0043b3e7391aa6e2972: 10 5362074bfd70c5f44af098775826c2e5: -5 3ad5fd4b119ccf341af11e4f3953aec7: 0.1 ea35908b86f315a459f8db35f136e7fa: 10 + 42e0888b4dc56cd4aa79c8fa0e6e7194: -7020 3a30a4abd3270184890ad608f7dbfcf1: 0.3 a0f664cbdffa15b4eac02e80e7e531c5: -25 + 865f05cb7e07abe4589d9505fb94106f: 100 + b336aecb274c7954bbf3862847a9dd40: 0.746 + 4ed166db154de5a49acc3009e00ec075: 76.2 + ce63eafbbb729d149878c9d6965df943: 0 e608c51c665f8e5449796daef6363f23: 2 aebaaf1cc6def6b498d3fae813c8257d: -50 + 8ba5cd3c7f725c34bbe5758f7d68eba5: 76.7 7731c25c38dd22d48a532fe325d73c28: 9.5 7a5eb45c88478da4aa61479eb7d3b2ae: 0.058 ef552f5c796a24a48ad4a4bdbecf71c6: -40 + e099f66cc75f5b842ad122e87bd8217a: 0.183 ddab1b7c555b6d849905f8c20e577061: 0 + f82b9c7c8fae5fb4d876202f0813f719: -885 f33ec48ca52993a4383c67e7536ac6c4: 10 99bb869cb31c0ee4fa96e331f2dd411b: 0.988 9fde869c68138584989d23fa0a55e769: 0.197 bb1b0b9c9e7c5dc4db64722b254878a6: -16 + a473e9ac301c75542980a4a231c06b29: -566 cf0edbcc2161397418b658ade65a0e94: 0 047eb8dcc3f9f854487bfbd2d0fe8665: 100 839424ec0aa4d1c499a7aae1bc653606: 1 + 1bdfa7ec923e7cb4083d4e0b82576888: 0.027 + 2bb5aafcb083c3944bf690c65d84e70d: 4.92 abd9211d35d3af54da7f92ec6bcec406: -60 c07aa51deaf06104d87ce4e8c14a903b: 0.8 2250a33dd8757ba408443e8bca3e7780: 2 8acc8f3d965aa0b42a9e20f4b2cf0fa8: 8000 7b2d806d2dba2e748853338bec2d7223: 0.8 + a0a8c27d07ef07940995b15bca440693: 2.8 eada757d6a31c7f4396f0e9f74296880: -20 + 46317c9dc55b33f449da5c0d8227fefb: 0.154 825f0f9dce48d304eac92a24b07bd81a: 0 599551cd07aa8644198f8812feb78fc0: 0.5 c1de9ecd35bed7d4b8e82cb0ad8ff2d0: 4.069 4a8a04ed9851248479e7b1b3022652ac: -11 c59f080eac4a4354a9ed50bbeeca2625: 0 a55d6b1ec73959f4da775e64689bd7e0: 2.44 + 04f53e1e95364dc47a08656a62272501: 10298 ed16252e7ba772d4ca94289e066e49a7: -12.498478 0951b62e8c3363342bb47a1370f7711c: -30 - 218bb63ed8250094a91a01ca7eec08eb: 20000 + 94a89b2edaf358d4f8aa96894d948c31: 80.3 + 218bb63ed8250094a91a01ca7eec08eb: 21082 4ca0fc3eb95aa914cb6316270d06b9fd: 0 + 3226776e200ef1949abf13d8dcb62bca: -7578 636b167e8f2087846822330723536837: 0 c516308ecc7534b408f7ad71c2a62ff5: 0 4113428e4739e4b479c0fb695e2eae39: 0 1899a09ea5443554788c8ce8b25f3650: 0 b38874beb190cb44ba57ef36d4f4b75b: 29.1 - 90fb2dbef46d76247b08fe5e6f439c33: 0.041711885 + 90fb2dbef46d76247b08fe5e6f439c33: 1.7477614 fd0f6ebe94c521a4189070aac5df375c: 0.8 ef1a10ce7e7057d4188921d91b58e697: 0.422 075b04deeb57c5240881f915afda4dad: 7.7 + 73ffc90f389903b4baa63469b529465e: 0.942 3ab1be1f86666554ba507f6d6bb81409: 11.5 + 6846a02ff7862cd4d88bf0a222b0298f: 0 5492f77f044cdad48b9ffc32c7041212: 3.43 d19c008fb1687854a89dab7b48da037e: -10 + c8e3af8f60eb69a4a980ed5bdfd4de36: 4.36 92986e9f25f548946b2ff4b1ca769598: 0 076b8ccf2d91b644ea14d95c926f5598: 0 61af92ef51a56584eb98a49357be5a1e: -30 @@ -312,7 +379,7 @@ AudioMixerGroupController: m_Effects: - {fileID: 244000013778923642} - {fileID: 244242988711724908} - - {fileID: 244254918515686042} + - {fileID: 244364689757200796} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -332,6 +399,7 @@ AudioMixerGroupController: m_Effects: - {fileID: 244000012286055166} - {fileID: 244884798662947936} + - {fileID: 244937564553803858} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -376,6 +444,7 @@ AudioMixerGroupController: m_Effects: - {fileID: 244000010456427624} - {fileID: 244523078009430112} + - {fileID: 244050289760918890} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -395,6 +464,7 @@ AudioMixerGroupController: m_Effects: - {fileID: 244202958119400608} - {fileID: 244020556120452074} + - {fileID: 244814583492568124} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -414,6 +484,7 @@ AudioMixerGroupController: m_Effects: - {fileID: 244480123928809872} - {fileID: 244063491831567580} + - {fileID: 244976079022489334} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -432,6 +503,8 @@ AudioMixerGroupController: m_Pitch: 52d3cf6759156c44ca0917885f1beb52 m_Effects: - {fileID: 244153840912956550} + - {fileID: 244290428595995700} + - {fileID: 244791668268762814} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -655,6 +728,48 @@ AudioMixerEffectController: m_SendTarget: {fileID: 244440943536586452} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244050289760918890 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 6ee01a5a2a59dd146b82b28178e5c34b + m_EffectName: SFX Reverb + m_MixLevel: 7de60a9bc9152074ba26c2573d0ee733 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: 5e04ba31d22d9ee48ac9da6004b04dea + - m_ParameterName: Room + m_GUID: 42e0888b4dc56cd4aa79c8fa0e6e7194 + - m_ParameterName: Room HF + m_GUID: 6846a02ff7862cd4d88bf0a222b0298f + - m_ParameterName: Decay Time + m_GUID: c8e3af8f60eb69a4a980ed5bdfd4de36 + - m_ParameterName: Decay HF Ratio + m_GUID: f53e59866f866244193117b49e1449d7 + - m_ParameterName: Reflections + m_GUID: d6b654257b2e4154685fce566d225910 + - m_ParameterName: Reflect Delay + m_GUID: a3eb880a58f88da4795c04efba54acb6 + - m_ParameterName: Reverb + m_GUID: 338e0a88659e1a341a9339a11c4ffc76 + - m_ParameterName: Reverb Delay + m_GUID: 2502d957993f9ce46abe4c5fbea6006b + - m_ParameterName: Diffusion + m_GUID: 8d45e4c20d33cb8409abdcc31a4458e9 + - m_ParameterName: Density + m_GUID: 3ef5d4064e010454f80512a45e090e34 + - m_ParameterName: HF Reference + m_GUID: d8bfa262e9bbd694bb790d18c717eeff + - m_ParameterName: Room LF + m_GUID: f82b9c7c8fae5fb4d876202f0813f719 + - m_ParameterName: LF Reference + m_GUID: 5ef99bddfa125b342a8c097a427e5e45 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &244054731547291996 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -908,23 +1023,7 @@ AudioMixerEffectController: m_EffectName: Send m_MixLevel: d110e753e0b0dff4d866396957ab69ef m_Parameters: [] - m_SendTarget: {fileID: 244816460214237328} - m_EnableWetMix: 0 - m_Bypass: 0 ---- !u!244 &244254918515686042 -AudioMixerEffectController: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_EffectID: 13994239dd2a7bd49a65815b7d6298ae - m_EffectName: Lowpass Simple - m_MixLevel: edd0179f97f6fc5419a89824cda83847 - m_Parameters: - - m_ParameterName: Cutoff freq - m_GUID: 016603c65dacd3440a0e202a6e1afa41 - m_SendTarget: {fileID: 0} + m_SendTarget: {fileID: 244056535615908380} m_EnableWetMix: 0 m_Bypass: 0 --- !u!244 &244268573342009230 @@ -941,6 +1040,48 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244290428595995700 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 954171e23a5f2ba43b9b55ccc975893d + m_EffectName: SFX Reverb + m_MixLevel: 6a335b24940c5cc4fa0564cbebe55ef5 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: 86566ab0866a16c46915eccf57f58fae + - m_ParameterName: Room + m_GUID: 7ace89218f1b89d4c8916826943e3998 + - m_ParameterName: Room HF + m_GUID: eb6a7d832faf00d43ad60feee9820b62 + - m_ParameterName: Decay Time + m_GUID: 2e0a5b01e25e97e40adda17dcdc70623 + - m_ParameterName: Decay HF Ratio + m_GUID: e3342cdaeb206c745a71dd38e31247bf + - m_ParameterName: Reflections + m_GUID: 1c1eab495e78a204585c2d1309f94e74 + - m_ParameterName: Reflect Delay + m_GUID: 308a0fa69b5394649ab80565f2998fdb + - m_ParameterName: Reverb + m_GUID: 463d7fe003ff11f41bdbf2c7ab486744 + - m_ParameterName: Reverb Delay + m_GUID: 33a40e1af1881af4eb51d455e571934b + - m_ParameterName: Diffusion + m_GUID: 83e9b806ae7f78740832eb385b87fb42 + - m_ParameterName: Density + m_GUID: 94a89b2edaf358d4f8aa96894d948c31 + - m_ParameterName: HF Reference + m_GUID: 813b2c57cb1c0b242a5e3475a5e78ac1 + - m_ParameterName: Room LF + m_GUID: 42bc744583e3d8844ba0cbe26585c839 + - m_ParameterName: LF Reference + m_GUID: 9753e27a0029c0e4589d72be99f54d2a + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &244327386010474882 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -969,6 +1110,48 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244364689757200796 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 746f74f09efacc145a412bce5eda5604 + m_EffectName: SFX Reverb + m_MixLevel: 6ae4c3daef3a25a46904524e578dc295 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: e3d64b0b3b69c4644ba00d681034d4d0 + - m_ParameterName: Room + m_GUID: bbef7dd28242668428240fb5ca023630 + - m_ParameterName: Room HF + m_GUID: 9a27e388e9875a64b8add0d2b36b37d7 + - m_ParameterName: Decay Time + m_GUID: 2bb5aafcb083c3944bf690c65d84e70d + - m_ParameterName: Decay HF Ratio + m_GUID: 13269223651b24d46a752c56059a485d + - m_ParameterName: Reflections + m_GUID: 0bb64dd6de1a36f43b89c245f9256e01 + - m_ParameterName: Reflect Delay + m_GUID: e7d77207f8e2d8f48bfd65a7cd634b30 + - m_ParameterName: Reverb + m_GUID: 6b6610d568e87b74495d07460685c408 + - m_ParameterName: Reverb Delay + m_GUID: 0fba5ed7895b89942960ca3e815e0305 + - m_ParameterName: Diffusion + m_GUID: 4ed166db154de5a49acc3009e00ec075 + - m_ParameterName: Density + m_GUID: 8ba5cd3c7f725c34bbe5758f7d68eba5 + - m_ParameterName: HF Reference + m_GUID: 0fd27df00cebb464faa9230e0d83f30d + - m_ParameterName: Room LF + m_GUID: f0e3c889cba0e944aae7d2c802fe77fa + - m_ParameterName: LF Reference + m_GUID: f12414eaccf14464da7dbbf13481fc71 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &244415231142600488 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -1235,6 +1418,64 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244791668268762814 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 4748f06dc4b004b449f051cd1b6f8499 + m_EffectName: Lowpass Simple + m_MixLevel: 7bccb631c3721694b9ef30e4efe0a39e + m_Parameters: + - m_ParameterName: Cutoff freq + m_GUID: c28c82d3afce2994aaf4e584cbee79d3 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 1 +--- !u!244 &244814583492568124 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 33fc4e5cd2c279240af06440d81fd996 + m_EffectName: SFX Reverb + m_MixLevel: 02d04503ad6827d45bfbf8d430656869 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: 8c74464177c85724480b91067e26b192 + - m_ParameterName: Room + m_GUID: 3226776e200ef1949abf13d8dcb62bca + - m_ParameterName: Room HF + m_GUID: aa10cf2c840dadd45bdd284e6e618673 + - m_ParameterName: Decay Time + m_GUID: 7e681116417ba95459e333108daac7d4 + - m_ParameterName: Decay HF Ratio + m_GUID: b336aecb274c7954bbf3862847a9dd40 + - m_ParameterName: Reflections + m_GUID: aa42d1a62f33771458ec9ebea1cf8049 + - m_ParameterName: Reflect Delay + m_GUID: b73902793eaee744fafe6c7887418b36 + - m_ParameterName: Reverb + m_GUID: c80bd7a5692afa54aabc9a1132fe5caa + - m_ParameterName: Reverb Delay + m_GUID: 1bdfa7ec923e7cb4083d4e0b82576888 + - m_ParameterName: Diffusion + m_GUID: 0d09014fa29393c41bbdce9383a9c4c6 + - m_ParameterName: Density + m_GUID: e2898a4651acc034591a7c297ee6d3dc + - m_ParameterName: HF Reference + m_GUID: 04f53e1e95364dc47a08656a62272501 + - m_ParameterName: Room LF + m_GUID: 9e85f62ff11bcd34690db58bfdd88fdb + - m_ParameterName: LF Reference + m_GUID: bfe07bfc93664ba4da8cd1a00150cb42 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &244816460214237328 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -1375,3 +1616,87 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &244937564553803858 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 63eb05fafaa951443b4450be37889008 + m_EffectName: SFX Reverb + m_MixLevel: a1fe422d6cf2fbf40bb3c5a5102114c7 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: 4b8a2e850e24a6941a9dcab4977f047d + - m_ParameterName: Room + m_GUID: c868f1f06623b934daa3ad6bbc4487db + - m_ParameterName: Room HF + m_GUID: ce7018f67ed1c6948bf826a9f09d14e7 + - m_ParameterName: Decay Time + m_GUID: 5aaff718afeba8d42b6cc6af7dda86ad + - m_ParameterName: Decay HF Ratio + m_GUID: 61887da213acbe3468a36c60672d122c + - m_ParameterName: Reflections + m_GUID: a42c23e0b7e489746868462528e10fcc + - m_ParameterName: Reflect Delay + m_GUID: 18d65f15f8b8d754bb245110d8a57659 + - m_ParameterName: Reverb + m_GUID: a473e9ac301c75542980a4a231c06b29 + - m_ParameterName: Reverb Delay + m_GUID: b6a846d35be694f4da28c0c133e6bfdb + - m_ParameterName: Diffusion + m_GUID: 865f05cb7e07abe4589d9505fb94106f + - m_ParameterName: Density + m_GUID: 5e06ba07ed62fa24280b19e13563fe59 + - m_ParameterName: HF Reference + m_GUID: caaf82f2e22dda643aa66b9a5afcffb8 + - m_ParameterName: Room LF + m_GUID: ce63eafbbb729d149878c9d6965df943 + - m_ParameterName: LF Reference + m_GUID: d37c58613741ac644880474468f7bf4e + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!244 &244976079022489334 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 3a845f4b47efe71458f7982b82d6aecc + m_EffectName: SFX Reverb + m_MixLevel: 2607de79446f12844a87db1342c9ca66 + m_Parameters: + - m_ParameterName: Dry Level + m_GUID: 8de9256311bc6ea45ac8fa345ee065bb + - m_ParameterName: Room + m_GUID: 8df02797b3fa1764288288bc89127555 + - m_ParameterName: Room HF + m_GUID: 1b300e5eec44c9a4d8eed5e1235d9971 + - m_ParameterName: Decay Time + m_GUID: f5d0de5f1cf28604db646dab09d2988e + - m_ParameterName: Decay HF Ratio + m_GUID: 452e263ebf01a9045bddc892994fd4f3 + - m_ParameterName: Reflections + m_GUID: d5c5329bc12ecf64d8cb23786f3dbaf4 + - m_ParameterName: Reflect Delay + m_GUID: c4967063e04e6ee41ad3eed63948ef93 + - m_ParameterName: Reverb + m_GUID: 874911601aaff5949a20869359563bc4 + - m_ParameterName: Reverb Delay + m_GUID: 0aa3d0f149f5a894d9979e1eb0fff1ce + - m_ParameterName: Diffusion + m_GUID: be2c68cdae818e94fa815e5450437b93 + - m_ParameterName: Density + m_GUID: 5999782f9ecb6244882de4cc68cbe445 + - m_ParameterName: HF Reference + m_GUID: 21f30d02d20313b4fb678bf30344dbd6 + - m_ParameterName: Room LF + m_GUID: c662093105a87db44bb49dbc73fce878 + - m_ParameterName: LF Reference + m_GUID: ef189759c348596418f01fa5fc17768c + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 new file mode 100644 index 0000000000..9fd8df7abb Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta new file mode 100644 index 0000000000..d7b64adf0a --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5947448ed78aa8a4891768f2caba1103 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3 new file mode 100644 index 0000000000..cf34f30083 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta new file mode 100644 index 0000000000..9f885aaf47 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_attacked.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4cf83db9ed2392c439bf3e0148e4ae4a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3 new file mode 100644 index 0000000000..cde826dd15 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta new file mode 100644 index 0000000000..a39e11dba8 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_fl_3008_skeff_casting_screeneff.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f10905534db65734a89866168c515422 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3 new file mode 100644 index 0000000000..1c9242f7ce Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta new file mode 100644 index 0000000000..6be7b84e0c --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_attacked.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 06cf871f360d88c4b8265017aa0b6fa8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3 new file mode 100644 index 0000000000..9995b2a06a Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta new file mode 100644 index 0000000000..b80269d94b --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_hs_3006_skeff_casting_screeneff.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 16e0b4d0c58355646b90ebea5b4f8048 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3 new file mode 100644 index 0000000000..cd4a55c158 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta new file mode 100644 index 0000000000..1bdad7cde7 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_attacked.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 69ca8068657e03b4488e2140326cf111 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3 new file mode 100644 index 0000000000..cf71c78b81 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta new file mode 100644 index 0000000000..9fccdf90a3 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_lms_3009_skeff_casting_screeneff.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1a7975732ad5b4e4198ecf769beb7581 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3 new file mode 100644 index 0000000000..997c70d0ac Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta new file mode 100644 index 0000000000..ab9b31ab79 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_attacked.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 166ac18d0dbbb5d47936405c830dcf5d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3 new file mode 100644 index 0000000000..a49b5fda0d Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta new file mode 100644 index 0000000000..008891ff65 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_md_3007_skeff_casting_screeneff.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b774de5e5b72bbb4591cd554c4e1960d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3 new file mode 100644 index 0000000000..1fec7fb87c Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta new file mode 100644 index 0000000000..9f3f3d9516 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_attacked.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1fa00212c37df734f98de45594eb6397 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3 new file mode 100644 index 0000000000..0c653bf8b7 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta new file mode 100644 index 0000000000..82ec6956ac --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/s_jieling_sl_3005_skeff_casting_screeneff.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8f3bb5e2a191e864fb7971b8432d1a42 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 index d4f797ed25..077117555a 100644 Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 index 636f80bdb1..47659d6348 100644 Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Battle_02.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 45ef026e6e..ff18d10670 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -8950,7 +8950,7 @@ ParticleSystem: --- !u!199 &3612650515471756776 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9009,6 +9009,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &505770842250798135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3658820307080558578} + - component: {fileID: 4467434971352855995} + - component: {fileID: 6559493155396458225} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3658820307080558578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505770842250798135} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5920091256592146076} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4467434971352855995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505770842250798135} + m_CullTransparentMesh: 0 +--- !u!114 &6559493155396458225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505770842250798135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &514895659153598263 GameObject: m_ObjectHideFlags: 0 @@ -10028,6 +10102,146 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &953603666181120984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5920091256592146076} + - component: {fileID: 1256521596463652073} + - component: {fileID: 33425264411396213} + - component: {fileID: 4818623307793287480} + - component: {fileID: 8155948301886312948} + m_Layer: 5 + m_Name: btnEndLess + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5920091256592146076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953603666181120984} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3658820307080558578} + - {fileID: 5439542028704354727} + - {fileID: 3535028079000984113} + m_Father: {fileID: 5352445832565045888} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 98, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1256521596463652073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953603666181120984} + m_CullTransparentMesh: 0 +--- !u!114 &33425264411396213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953603666181120984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4818623307793287480} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &4818623307793287480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953603666181120984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!95 &8155948301886312948 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953603666181120984} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &965127853240215727 GameObject: m_ObjectHideFlags: 0 @@ -15668,7 +15882,7 @@ ParticleSystem: --- !u!199 &2077135144819501974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21157,7 +21371,7 @@ ParticleSystem: --- !u!199 &5382233283546536858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29184,7 +29398,7 @@ ParticleSystem: --- !u!199 &7853653569377049714 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29956,6 +30170,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3143014610662857415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5439542028704354727} + - component: {fileID: 7144515067775352344} + - component: {fileID: 8171384327707400034} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5439542028704354727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143014610662857415} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3562039041186135146} + m_Father: {fileID: 5920091256592146076} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 176, y: 176} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7144515067775352344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143014610662857415} + m_CullTransparentMesh: 0 +--- !u!114 &8171384327707400034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143014610662857415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 5a8901c400a952045b296654b26852ab, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3150642506789933119 GameObject: m_ObjectHideFlags: 0 @@ -35085,7 +35374,7 @@ ParticleSystem: --- !u!199 &4678487443364567018 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40552,7 +40841,7 @@ ParticleSystem: --- !u!199 &3301434479282110283 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46451,7 +46740,7 @@ ParticleSystem: --- !u!199 &8426323061574149814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51596,7 +51885,7 @@ ParticleSystem: --- !u!199 &3988090302360095373 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57179,7 +57468,7 @@ ParticleSystem: --- !u!199 &5461926455895321923 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -62303,7 +62592,7 @@ ParticleSystem: --- !u!199 &6960492284779320589 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -62886,6 +63175,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4617127911449407355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3562039041186135146} + - component: {fileID: 8582731860418925768} + - component: {fileID: 1740424978376335241} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3562039041186135146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4617127911449407355} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5439542028704354727} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.6, y: -49.5} + m_SizeDelta: {x: 117.76, y: 65.64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8582731860418925768 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4617127911449407355} + m_CullTransparentMesh: 0 +--- !u!114 &1740424978376335241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4617127911449407355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.972549, g: 0.92156863, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65E0\u5C3D" + LanguageIndex: 11043 --- !u!1 &4620582756844543782 GameObject: m_ObjectHideFlags: 0 @@ -68618,7 +68987,7 @@ ParticleSystem: --- !u!199 &4261467272199160834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69143,6 +69512,7 @@ RectTransform: - {fileID: 112967303376310105} - {fileID: 2596259553296166895} - {fileID: 348893781} + - {fileID: 5920091256592146076} m_Father: {fileID: 8831099743542526053} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -72935,6 +73305,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6524790213277019500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3535028079000984113} + - component: {fileID: 5215176420683823679} + - component: {fileID: 979575301393090075} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3535028079000984113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6524790213277019500} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5920091256592146076} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 35.4, y: 23.6} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5215176420683823679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6524790213277019500} + m_CullTransparentMesh: 0 +--- !u!114 &979575301393090075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6524790213277019500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6543628982998522749 GameObject: m_ObjectHideFlags: 0 @@ -77909,7 +78353,7 @@ ParticleSystem: --- !u!199 &6383407699291000078 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83977,7 +84421,7 @@ ParticleSystem: --- !u!199 &1706209193022837301 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90623,7 +91067,7 @@ ParticleSystem: --- !u!199 &8234207848460451360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -95455,7 +95899,7 @@ ParticleSystem: --- !u!199 &3615746855071839570 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 43ebe5a136..4bcd48aa32 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1,4 +1,4 @@ -local floor = math.floor +local floor = math.floor local max = math.max local min = math.min --local RoleDataName = RoleDataName @@ -2206,7 +2206,7 @@ local passivityList = { -- 释放技能后 local onSkillEnd = function(skill) if skill.type == BattleSkillType.Special then - local list = RoleManager.Query(function(v) return v.position > 3 end) + local list = RoleManager.Query(function(v) return v.position > 3 and v.camp==role.camp end) for _, r in ipairs(list) do r:AddRage(i1, CountTypeName.Add) end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index e5ae4ec056..7e336f28ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -179,6 +179,7 @@ function this.InitCompShow() end function this.SetStaticData() + LogGreen("EndLessMapManager.openMapId "..EndLessMapManager.openMapId) local mapData = endLessConfig[EndLessMapManager.openMapId] if not mapData then Log(Language[10362]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 3d2515551c..4a3cf3bb98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -193,7 +193,8 @@ function this:InitComponent() this.btnRank = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnRank") this.rankRed = Util.GetGameObject(this.btnRank, "redPoint") - + -- 无尽 + this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess") -- 设置 --this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting") @@ -701,6 +702,10 @@ function this:BindEvent() end this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ALLRANKING) end) + + Util.AddClick(this.btnEndLess, function() + UIManager.OpenPanel(UIName.EndLessCarbonPanel) + end) -- Util.AddClick(this.btnGuanxing, function() -- JumpManager.GoJump(1024) -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ASPECT_STAR) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index f502e229d4..db2ba101de 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,352 +13,352 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - D:\JL_Client/data_execl/base_data\ArenaRobotSetting.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxPools.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSeaons.xlsx - - D:\JL_Client/data_execl/base_data\BloodyMessagesConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArenaRobotConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArenaReward.xlsx - - D:\JL_Client/data_execl/base_data\ChampionshipSetting.xlsx - - D:\JL_Client/data_execl/base_data\BeginnerTask.xlsx - - D:\JL_Client/data_execl/base_data\ActivityDropReward.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleTask.xlsx - - D:\JL_Client/data_execl/base_data\ActivityRankingReward.xlsx - - D:\JL_Client/data_execl/base_data\EndlessDifficulty.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleSetting.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsConfig.xlsx - - D:\JL_Client/data_execl/base_data\DialRewardSetting.xlsx - - D:\JL_Client/data_execl/base_data\DialRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\DailyTasksConfig.xlsx - - D:\JL_Client/data_execl/base_data\DailyChallengeConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeSetting.xlsx - - D:\JL_Client/data_execl/base_data\BuffEffectConfig.xlsx - - D:\JL_Client/data_execl/base_data\AchievementConfig.xlsx - - D:\JL_Client/data_execl/base_data\BlessingConfig.xlsx - - D:\JL_Client/data_execl/base_data\BeStronger.xlsx - - D:\JL_Client/data_execl/base_data\ArenaSetting.xlsx - - D:\JL_Client/data_execl/base_data\ArenaBattleReward.xlsx - - D:\JL_Client/data_execl/base_data\GuildScoreConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionSetting.xlsx - - D:\JL_Client/data_execl/base_data\AccomplishmentConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleTreasure.xlsx - - D:\JL_Client/data_execl/base_data\GameSetting.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeMapConfig.xlsx - - D:\JL_Client/data_execl/base_data\AreaConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeMissionConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChampionshipReward.xlsx - - D:\JL_Client/data_execl/base_data\CombatControl.xlsx - - D:\JL_Client/data_execl/base_data\GlobalSystemConfig.xlsx - - D:\JL_Client/data_execl/base_data\AdventureConfig.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsBoxSetting.xlsx - - D:\JL_Client/data_execl/base_data\AdventureReward.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionFloorConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExchangeActivityConfig.xlsx - - D:\JL_Client/data_execl/base_data\BlessingRewardPool.xlsx - - D:\JL_Client/data_execl/base_data\BloodyBattleReward.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionNodeConfig.xlsx - - D:\JL_Client/data_execl/base_data\FakeBattle.xlsx - - D:\JL_Client/data_execl/base_data\GuildSacrificeRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ErrorCodeEerverConfig.xlsx - - D:\JL_Client/data_execl/base_data\AudioConfig.xlsx - - D:\JL_Client/data_execl/base_data\ElementalResonanceConfig.xlsx - - D:\JL_Client/data_execl/base_data\FoodsConfig.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsStageConfig.xlsx - - D:\JL_Client/data_execl/base_data\GlobalActivity.xlsx - - D:\JL_Client/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx - - D:\JL_Client/data_execl/base_data\DialogueViewConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildBossConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildBossRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChapterOptionConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChapterEventPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroSacrifice.xlsx - - D:\JL_Client/data_execl/base_data\GuildHelpConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroRankupConfig.xlsx - - D:\JL_Client/data_execl/base_data\BloodyRankConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildRedPackConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildWarConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildSetting.xlsx - - D:\JL_Client/data_execl/base_data\GuildWarRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExploreFunctionConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\ChallengeStarBox.xlsx - - D:\JL_Client/data_execl/base_data\GuideConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildSacrificeConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionRecruitConfig.xlsx - - D:\JL_Client/data_execl/base_data\ExpeditionHolyConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipSignSetting.xlsx - - D:\JL_Client/data_execl/base_data\ErrorCodeHint.xlsx - - D:\JL_Client/data_execl/base_data\EquipTalismanaLottery.xlsx - - D:\JL_Client/data_execl/base_data\EquipStarsConfig.xlsx - - D:\JL_Client/data_execl/base_data\LuxuryFund.xlsx - - D:\JL_Client/data_execl/base_data\JewelResonanceConfig.xlsx - - D:\JL_Client/data_execl/base_data\LevelSetting.xlsx - - D:\JL_Client/data_execl/base_data\JumpConfig.xlsx - - D:\JL_Client/data_execl/base_data\JewelConfig.xlsx - - D:\JL_Client/data_execl/base_data\FloodConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroRankupGroup.xlsx - - D:\JL_Client/data_execl/base_data\ActivityRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\LoginPosterConfig.xlsx - - D:\JL_Client/data_execl/base_data\ArtResourcesConfig.xlsx - - D:\JL_Client/data_execl/base_data\LuckyCatConfig.xlsx - - D:\JL_Client/data_execl/base_data\LotterySpecialConfig.xlsx - - D:\JL_Client/data_execl/base_data\LotterySetting.xlsx - - D:\JL_Client/data_execl/base_data\EquipTalismanaRankup.xlsx - - D:\JL_Client/data_execl/base_data\EquipSuiteConfig.xlsx - - D:\JL_Client/data_execl/base_data\EndlessMapConfig.xlsx - - D:\JL_Client/data_execl/base_data\SeverConfig.xlsx - - D:\JL_Client/data_execl/base_data\RunesPoolConfig.xlsx - - D:\JL_Client/data_execl/base_data\MainMapIconConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonthcardConfig.xlsx - - D:\JL_Client/data_execl/base_data\RunesConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipSign.xlsx - - D:\JL_Client/data_execl/base_data\SevenDaysScore.xlsx - - D:\JL_Client/data_execl/base_data\MainLevelSettingConfig.xlsx - - D:\JL_Client/data_execl/base_data\MazeTreasure.xlsx - - D:\JL_Client/data_execl/base_data\MazeTreasureSetting.xlsx - - D:\JL_Client/data_execl/base_data\SignInConfig.xlsx - - D:\JL_Client/data_execl/base_data\RaceTowerRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\MissionEventsConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonsterViewConfig.xlsx - - D:\JL_Client/data_execl/base_data\OptionAddCondition.xlsx - - D:\JL_Client/data_execl/base_data\PlayerAppearance.xlsx - - D:\JL_Client/data_execl/base_data\LotteryRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\PlayerMountLevelUp.xlsx - - D:\JL_Client/data_execl/base_data\PlayerRole.xlsx - - D:\JL_Client/data_execl/base_data\RewardItemConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipConfig.xlsx - - D:\JL_Client/data_execl/base_data\TreasureTaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialGameConfig.xlsx - - D:\JL_Client/data_execl/base_data\RoleConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialSetting.xlsx - - D:\JL_Client/data_execl/base_data\TrialKillConfig.xlsx - - D:\JL_Client/data_execl/base_data\SpecialConfig.xlsx - - D:\JL_Client/data_execl/base_data\StoreTypeConfig.xlsx - - D:\JL_Client/data_execl/base_data\SystemMessageConfig.xlsx - - D:\JL_Client/data_execl/base_data\TreasureSunlongTaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\QAConfig.xlsx - - D:\JL_Client/data_execl/base_data\PrivilegeTypeConfig.xlsx - - D:\JL_Client/data_execl/base_data\RechargeCommodityConfig.xlsx - - D:\JL_Client/data_execl/base_data\RaceTowerConfig.xlsx - - D:\JL_Client/data_execl/base_data\SevenDaysActivity.xlsx - - D:\JL_Client/data_execl/base_data\RecommendTeam.xlsx - - D:\JL_Client/data_execl/base_data\EquipPropertyPool.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopFunctionConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopSetting.xlsx - - D:\JL_Client/data_execl/base_data\RandomName.xlsx - - D:\JL_Client/data_execl/base_data\PlayerLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\PropertyConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialQuestionConfig.xlsx - - D:\JL_Client/data_execl/base_data\ItemConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopRebuildConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopFoundationConfig.xlsx - - D:\JL_Client/data_execl/base_data\MapPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\VipLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\LevelDifficultyConfig.xlsx - - D:\JL_Client/data_execl/base_data\UIConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossRewardConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossSetting.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopEquipmentConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopTechnologySetting.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossConfig.xlsx - - D:\JL_Client/data_execl/base_data\WorldBossTreasureConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroReturn.xlsx - - D:\JL_Client/data_execl/base_data\HeroLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\HeroConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialConfig.xlsx - - D:\JL_Client/data_execl/base_data\TrialwelfareConfig.xlsx - - D:\JL_Client/data_execl/base_data\JewelRankupConfig.xlsx - - D:\JL_Client/data_execl/base_data\SkillConfig.xlsx - - D:\JL_Client/data_execl/base_data\TestWelfare.xlsx - - D:\JL_Client/data_execl/base_data\TaskConfig.xlsx - - D:\JL_Client/data_execl/base_data\TreasureSunlongConfig.xlsx - - D:\JL_Client/data_execl/base_data\PassiveSkillConfig.xlsx - - D:\JL_Client/data_execl/base_data\EventPointConfig.xlsx - - D:\JL_Client/data_execl/base_data\SkillLogicConfig.xlsx - - D:\JL_Client/data_execl/base_data\PassiveSkillLogicConfig.xlsx - - D:\JL_Client/data_execl/base_data\GuildTechnology.xlsx - - D:\JL_Client/data_execl/base_data\StoreConfig.xlsx - - D:\JL_Client/data_execl/base_data\EquipTalismana.xlsx - - D:\JL_Client/data_execl/base_data\WorkShopTechnology.xlsx - - D:\JL_Client/data_execl/base_data\RewardGroup.xlsx - - D:\JL_Client/data_execl/base_data\OptionConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonsterGroup.xlsx - - D:\JL_Client/data_execl/base_data\MainLevelConfig.xlsx - - D:\JL_Client/data_execl/base_data\MonsterConfig.xlsx + - F:\jielingNew/data_execl/base_data\ActivityDropReward.xlsx + - F:\jielingNew/data_execl/base_data\ActivityRankingReward.xlsx + - F:\jielingNew/data_execl/base_data\ErrorCodeHint.xlsx + - F:\jielingNew/data_execl/base_data\AchievementConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExchangeActivityConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExpeditionFloorConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExpeditionNodeConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExpeditionRecruitConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExpeditionHolyConfig.xlsx + - F:\jielingNew/data_execl/base_data\ExploreFunctionConfig.xlsx + - F:\jielingNew/data_execl/base_data\ArenaBattleReward.xlsx + - F:\jielingNew/data_execl/base_data\AreaConfig.xlsx + - F:\jielingNew/data_execl/base_data\ArenaReward.xlsx + - F:\jielingNew/data_execl/base_data\AdventureReward.xlsx + - F:\jielingNew/data_execl/base_data\ArenaRobotConfig.xlsx + - F:\jielingNew/data_execl/base_data\FakeBattle.xlsx + - F:\jielingNew/data_execl/base_data\ExpeditionSetting.xlsx + - F:\jielingNew/data_execl/base_data\ErrorCodeEerverConfig.xlsx + - F:\jielingNew/data_execl/base_data\BuffEffectConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipSuiteConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipStarsConfig.xlsx + - F:\jielingNew/data_execl/base_data\BloodyBattleTask.xlsx + - F:\jielingNew/data_execl/base_data\AccomplishmentConfig.xlsx + - F:\jielingNew/data_execl/base_data\GameSetting.xlsx + - F:\jielingNew/data_execl/base_data\ArenaSetting.xlsx + - F:\jielingNew/data_execl/base_data\FoodsConfig.xlsx + - F:\jielingNew/data_execl/base_data\BloodyBattleSetting.xlsx + - F:\jielingNew/data_execl/base_data\GlobalSystemConfig.xlsx + - F:\jielingNew/data_execl/base_data\GlobalActivity.xlsx + - F:\jielingNew/data_execl/base_data\BlessingRewardPool.xlsx + - F:\jielingNew/data_execl/base_data\BloodyBattleReward.xlsx + - F:\jielingNew/data_execl/base_data\BlessingConfig.xlsx + - F:\jielingNew/data_execl/base_data\BeStronger.xlsx + - F:\jielingNew/data_execl/base_data\AdventureConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuideConfig.xlsx + - F:\jielingNew/data_execl/base_data\BeginnerTask.xlsx + - F:\jielingNew/data_execl/base_data\GuildScoreConfig.xlsx + - F:\jielingNew/data_execl/base_data\ArenaRobotSetting.xlsx + - F:\jielingNew/data_execl/base_data\AudioConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildSacrificeRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildWarConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildHelpConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipSignSetting.xlsx + - F:\jielingNew/data_execl/base_data\GuildSacrificeConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildBossConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildSetting.xlsx + - F:\jielingNew/data_execl/base_data\GuildLevelConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildRedPackConfig.xlsx + - F:\jielingNew/data_execl/base_data\HeroRankupConfig.xlsx + - F:\jielingNew/data_execl/base_data\HeroRankupGroup.xlsx + - F:\jielingNew/data_execl/base_data\JewelResonanceConfig.xlsx + - F:\jielingNew/data_execl/base_data\FloodConfig.xlsx + - F:\jielingNew/data_execl/base_data\LevelSetting.xlsx + - F:\jielingNew/data_execl/base_data\EquipPropertyPool.xlsx + - F:\jielingNew/data_execl/base_data\EquipSign.xlsx + - F:\jielingNew/data_execl/base_data\LotterySetting.xlsx + - F:\jielingNew/data_execl/base_data\JumpConfig.xlsx + - F:\jielingNew/data_execl/base_data\LoginPosterConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildWarRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\GuildBossRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipTalismanaLottery.xlsx + - F:\jielingNew/data_execl/base_data\JewelConfig.xlsx + - F:\jielingNew/data_execl/base_data\MonthcardConfig.xlsx + - F:\jielingNew/data_execl/base_data\MonsterViewConfig.xlsx + - F:\jielingNew/data_execl/base_data\OptionAddCondition.xlsx + - F:\jielingNew/data_execl/base_data\HeroSacrifice.xlsx + - F:\jielingNew/data_execl/base_data\PlayerAppearance.xlsx + - F:\jielingNew/data_execl/base_data\PlayerLevelConfig.xlsx + - F:\jielingNew/data_execl/base_data\ActivityRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\LotteryRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\EndlessMapConfig.xlsx + - F:\jielingNew/data_execl/base_data\LevelDifficultyConfig.xlsx + - F:\jielingNew/data_execl/base_data\HeroLevelConfig.xlsx + - F:\jielingNew/data_execl/base_data\ElementalResonanceConfig.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsBoxPools.xlsx + - F:\jielingNew/data_execl/base_data\HeroReturn.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSeaons.xlsx + - F:\jielingNew/data_execl/base_data\ChallengeSetting.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsConfig.xlsx + - F:\jielingNew/data_execl/base_data\RunesPoolConfig.xlsx + - F:\jielingNew/data_execl/base_data\SevenDaysActivity.xlsx + - F:\jielingNew/data_execl/base_data\SevenDaysScore.xlsx + - F:\jielingNew/data_execl/base_data\SeverConfig.xlsx + - F:\jielingNew/data_execl/base_data\SignInConfig.xlsx + - F:\jielingNew/data_execl/base_data\EndlessDifficulty.xlsx + - F:\jielingNew/data_execl/base_data\ChampionshipSetting.xlsx + - F:\jielingNew/data_execl/base_data\DailyChallengeConfig.xlsx + - F:\jielingNew/data_execl/base_data\ChallengeMapConfig.xlsx + - F:\jielingNew/data_execl/base_data\ChallengeConfig.xlsx + - F:\jielingNew/data_execl/base_data\SpecialConfig.xlsx + - F:\jielingNew/data_execl/base_data\PlayerMountLevelUp.xlsx + - F:\jielingNew/data_execl/base_data\ChallengeStarBox.xlsx + - F:\jielingNew/data_execl/base_data\HeroConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipConfig.xlsx + - F:\jielingNew/data_execl/base_data\BloodyRankConfig.xlsx + - F:\jielingNew/data_execl/base_data\DailyTasksConfig.xlsx + - F:\jielingNew/data_execl/base_data\RewardItemConfig.xlsx + - F:\jielingNew/data_execl/base_data\PassiveSkillConfig.xlsx + - F:\jielingNew/data_execl/base_data\PropertyConfig.xlsx + - F:\jielingNew/data_execl/base_data\TrialSetting.xlsx + - F:\jielingNew/data_execl/base_data\TrialwelfareConfig.xlsx + - F:\jielingNew/data_execl/base_data\RaceTowerConfig.xlsx + - F:\jielingNew/data_execl/base_data\QAConfig.xlsx + - F:\jielingNew/data_execl/base_data\VipLevelConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopEquipmentConfig.xlsx + - F:\jielingNew/data_execl/base_data\TrialKillConfig.xlsx + - F:\jielingNew/data_execl/base_data\JewelRankupConfig.xlsx + - F:\jielingNew/data_execl/base_data\SkillConfig.xlsx + - F:\jielingNew/data_execl/base_data\UIConfig.xlsx + - F:\jielingNew/data_execl/base_data\TrialQuestionConfig.xlsx + - F:\jielingNew/data_execl/base_data\PlayerRole.xlsx + - F:\jielingNew/data_execl/base_data\WorldBossRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorldBossSetting.xlsx + - F:\jielingNew/data_execl/base_data\GuildTechnology.xlsx + - F:\jielingNew/data_execl/base_data\MissionEventsConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopFoundationConfig.xlsx + - F:\jielingNew/data_execl/base_data\LuckyCatConfig.xlsx + - F:\jielingNew/data_execl/base_data\MazeTreasureSetting.xlsx + - F:\jielingNew/data_execl/base_data\BloodyMessagesConfig.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorldBossTreasureConfig.xlsx + - F:\jielingNew/data_execl/base_data\TreasureSunlongTaskConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopFunctionConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipTalismanaRankup.xlsx + - F:\jielingNew/data_execl/base_data\BloodyBattleTreasure.xlsx + - F:\jielingNew/data_execl/base_data\RunesConfig.xlsx + - F:\jielingNew/data_execl/base_data\TestWelfare.xlsx + - F:\jielingNew/data_execl/base_data\ChampionshipReward.xlsx + - F:\jielingNew/data_execl/base_data\TrialGameConfig.xlsx + - F:\jielingNew/data_execl/base_data\TaskConfig.xlsx + - F:\jielingNew/data_execl/base_data\LuxuryFund.xlsx + - F:\jielingNew/data_execl/base_data\DialRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\ChapterOptionConfig.xlsx + - F:\jielingNew/data_execl/base_data\TreasureTaskConfig.xlsx + - F:\jielingNew/data_execl/base_data\DialRewardSetting.xlsx + - F:\jielingNew/data_execl/base_data\TreasureSunlongConfig.xlsx + - F:\jielingNew/data_execl/base_data\ItemConfig.xlsx + - F:\jielingNew/data_execl/base_data\ArtResourcesConfig.xlsx + - F:\jielingNew/data_execl/base_data\PrivilegeTypeConfig.xlsx + - F:\jielingNew/data_execl/base_data\ChallengeMissionConfig.xlsx + - F:\jielingNew/data_execl/base_data\RechargeCommodityConfig.xlsx + - F:\jielingNew/data_execl/base_data\RoleConfig.xlsx + - F:\jielingNew/data_execl/base_data\SystemMessageConfig.xlsx + - F:\jielingNew/data_execl/base_data\RecommendTeam.xlsx + - F:\jielingNew/data_execl/base_data\StoreTypeConfig.xlsx + - F:\jielingNew/data_execl/base_data\RandomName.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsStageConfig.xlsx + - F:\jielingNew/data_execl/base_data\CombatControl.xlsx + - F:\jielingNew/data_execl/base_data\MainMapIconConfig.xlsx + - F:\jielingNew/data_execl/base_data\RaceTowerRewardConfig.xlsx + - F:\jielingNew/data_execl/base_data\LotterySpecialConfig.xlsx + - F:\jielingNew/data_execl/base_data\DifferDemonsBoxSetting.xlsx + - F:\jielingNew/data_execl/base_data\MazeTreasure.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopRebuildConfig.xlsx + - F:\jielingNew/data_execl/base_data\DialogueViewConfig.xlsx + - F:\jielingNew/data_execl/base_data\ChapterEventPointConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorldBossConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopTechnologySetting.xlsx + - F:\jielingNew/data_execl/base_data\TrialConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopSetting.xlsx + - F:\jielingNew/data_execl/base_data\MainLevelSettingConfig.xlsx + - F:\jielingNew/data_execl/base_data\PassiveSkillLogicConfig.xlsx + - F:\jielingNew/data_execl/base_data\SkillLogicConfig.xlsx + - F:\jielingNew/data_execl/base_data\StoreConfig.xlsx + - F:\jielingNew/data_execl/base_data\EventPointConfig.xlsx + - F:\jielingNew/data_execl/base_data\MapPointConfig.xlsx + - F:\jielingNew/data_execl/base_data\EquipTalismana.xlsx + - F:\jielingNew/data_execl/base_data\OptionConfig.xlsx + - F:\jielingNew/data_execl/base_data\WorkShopTechnology.xlsx + - F:\jielingNew/data_execl/base_data\RewardGroup.xlsx + - F:\jielingNew/data_execl/base_data\MonsterGroup.xlsx + - F:\jielingNew/data_execl/base_data\MainLevelConfig.xlsx + - F:\jielingNew/data_execl/base_data\MonsterConfig.xlsx _values: - - 2652005642 - - 903221398 - - 249002466 - - 4055477448 - - 3947848933 - - 2296996310 - - 3338153430 - - 755222564 - 3591751192 - - 2131302457 - 1048362391 - - 1240442055 - - 2050621784 - - 460607005 - - 4198004043 - - 109990768 - - 3755728772 - - 1774803500 - - 1705732776 - - 2605131572 + - 1448464981 - 353142748 - - 309514008 - - 984518206 - - 1924824445 - - 3252026258 - - 3079207713 - - 3674283409 - - 427098595 - - 3507522218 - - 636689279 - - 2031449552 - - 413963702 - - 2759035733 - - 1572157444 - - 4243693008 - - 1035900444 - - 1004939189 - - 1848421159 - - 932779961 - - 613479935 - - 3621447502 - 243491956 + - 1702782288 + - 1882717235 + - 1023901955 + - 587159277 + - 1382260277 + - 3252026258 + - 413963702 + - 2296996310 + - 613479935 + - 3947848933 + - 3224705358 + - 3674283409 + - 527608228 + - 2605131572 + - 4124958540 + - 494399256 + - 2131302457 + - 427098595 + - 636689279 + - 1924824445 + - 3226994303 + - 2050621784 + - 1877416840 + - 2504417140 - 732833747 - 230994945 - - 1180842953 - - 1510460150 + - 309514008 + - 2613230219 + - 1848421159 + - 4202904691 + - 755222564 + - 3079207713 + - 2652005642 + - 2773656346 - 1468913191 - - 527608228 - - 3102098770 - - 583891024 - - 3226994303 - - 1402356663 - - 2506350549 - - 568553271 - - 1791256076 - - 173728414 - - 3943131728 - - 3033812632 - - 3442665542 - - 4289672541 - - 3894020600 - - 3153364400 - - 2339254632 - - 3548626589 - - 475620184 - 3585263874 - - 3472737567 - - 2445182985 - - 1382260277 - - 1442255327 - - 1565259591 - - 2697187761 - - 1996735664 - - 1023901955 - - 102401832 + - 3894020600 - 3517900411 - - 1448464981 - - 2568046174 - - 494399256 - - 2903827109 - - 3597116301 - - 3705022903 - - 2264269610 - - 727009153 - - 3089114090 + - 1996735664 + - 173728414 + - 3472737567 + - 3153364400 + - 1442255327 + - 475620184 + - 947577082 - 1493914227 - - 46486138 - - 2501740502 - - 3767796597 - - 2479323017 - - 3682513624 - - 425543864 - - 2294226303 - - 4124958540 - - 3347320787 - - 2748321716 - - 804383039 - - 1513139482 - - 1786980484 - - 1155516420 + - 3597116301 + - 3089114090 + - 3705022903 + - 3153107712 - 1790592577 - - 1952787401 - - 1393544882 - - 2048030774 - - 3746847302 - - 3911391710 - - 2842862470 - - 3625815197 + - 2615195422 + - 2264269610 + - 1383251309 + - 2445182985 + - 3943131728 + - 2568046174 + - 727009153 + - 1786980484 - 515856748 - 683415129 + - 4289672541 - 2534897219 - - 1445024159 - - 319164499 - - 3641128642 - - 15839083 - - 2405263382 - - 1513554725 - - 1982645928 - - 3359043732 - - 2769353865 - - 739739032 - - 296490936 - - 2202441613 - - 297530923 - - 898095515 - - 1718208583 - - 277486271 - - 3962075773 - - 4177681514 - - 160427834 - - 1241393841 - - 3153107712 - - 2405621183 - - 3663717884 - - 38983593 - - 3561388971 - - 2867634862 - - 2656593449 - - 344090662 - - 2777840995 - - 98336120 - - 1162865092 - - 241982493 + - 1173373930 + - 718427012 + - 2007302048 + - 2143974197 - 295715991 - - 2532109620 + - 3255901169 + - 583891024 + - 903221398 + - 322704922 + - 249002466 + - 1705732776 + - 460607005 + - 804383039 + - 160427834 + - 1952787401 + - 2748321716 + - 29725303 + - 1240442055 + - 3338153430 + - 1774803500 + - 4138292608 + - 2759035733 + - 3793425517 + - 319164499 + - 1565259591 + - 44417242 + - 3399006818 + - 3548626589 + - 2313402981 + - 3785474662 + - 190236436 + - 2867634862 + - 2769353865 + - 2854113790 + - 4177681514 + - 1376213266 + - 241982493 + - 110435588 + - 739739032 + - 980629513 + - 1968656445 + - 2063938483 + - 2656593449 + - 3641128642 - 967064327 - 811712663 - - 110435588 - - 3048495520 - - 2606088806 - - 625696080 - - 3935903312 - - 3255901169 - - 3372973847 - - 3509406354 - - 2854113790 - - 980629513 - - 2162791513 - - 4291486445 - - 3951547032 - - 1115488926 - - 98570907 - - 2343409024 - - 3036639695 - - 491951589 - 312894044 - - 2702462397 - - 2362342209 - - 2453679101 - - 390613341 + - 3625815197 + - 98336120 + - 2479323017 + - 3746847302 + - 4055477448 + - 568553271 + - 625696080 + - 898095515 + - 2405621183 + - 2294226303 + - 3507522218 + - 1155516420 + - 4291486445 + - 4243693008 + - 1982645928 + - 3951547032 + - 2903827109 + - 3566908170 + - 3033812632 + - 884120277 + - 4198004043 + - 1115488926 + - 2933706447 + - 4065266353 + - 4109403856 + - 1572157444 + - 1361347861 + - 595208311 + - 297530923 + - 66427457 + - 185551317 + - 38983593 + - 1402356663 + - 3391591373 + - 260126611 + - 2842862470 + - 3682513624 + - 932779961 + - 3172113218 + - 2777840995 + - 1791256076 + - 3442665542 + - 1321320575 + - 3048495520 + - 3509406354 + - 3663717884 + - 1393544882 + - 1507661270 + - 3096694926 + - 1953866579 + - 1518966747 + - 4037636284 + - 1912768560 - 1704981563 - - 2594442567 + - 2453679101 + - 3164110821 + - 1266460480 - 1397243523 - - 1488525775 + - 3091910782 diff --git a/data_execl/base_data/ArtResourcesConfig.xlsx b/data_execl/base_data/ArtResourcesConfig.xlsx index b3824ecee7..dfc67a5296 100644 Binary files a/data_execl/base_data/ArtResourcesConfig.xlsx and b/data_execl/base_data/ArtResourcesConfig.xlsx differ diff --git a/data_execl/base_data/EndlessMapConfig.xlsx b/data_execl/base_data/EndlessMapConfig.xlsx index 98444a73a8..ef56cbc05f 100644 Binary files a/data_execl/base_data/EndlessMapConfig.xlsx and b/data_execl/base_data/EndlessMapConfig.xlsx differ diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx index bf3f0c3e1c..10084e3bdd 100644 Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ diff --git a/data_execl/base_data/HeroRankupConfig.xlsx b/data_execl/base_data/HeroRankupConfig.xlsx index f5707ee18d..1d1d426757 100644 Binary files a/data_execl/base_data/HeroRankupConfig.xlsx and b/data_execl/base_data/HeroRankupConfig.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index bef0c60f3c..aac5596c35 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ