From a2e8427593dd3e86c4cccbd6050b4b25aed14958 Mon Sep 17 00:00:00 2001 From: chenxin <chenxin6991@163.com> Date: Wed, 09 Dec 2020 18:30:25 +0800 Subject: [PATCH] 打包 --- Assets/Resources/Prefabs/Enemies/103.prefab | 254 +++++++----------- GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0 Assets/Resources/Prefabs/Enemies/101.prefab | 259 +++++++------------ GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0 Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab | 10 GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0 GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll | 0 GemBattle/宝石塔防_Data/resources.assets | 0 And/GemBattle.apk | 0 GemBattle/宝石塔防_Data/sharedassets1.assets | 0 GemBattle/宝石塔防_Data/globalgamemanagers | 0 GemBattle.7z | 0 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0 Assets/Resources/Prefabs/Enemies/102.prefab | 255 +++++++------------ GemBattle/宝石塔防_Data/level1 | 0 GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0 GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0 GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0 19 files changed, 306 insertions(+), 472 deletions(-) diff --git a/And/GemBattle.apk b/And/GemBattle.apk index e4a2e4c..05a596e 100644 --- a/And/GemBattle.apk +++ b/And/GemBattle.apk Binary files differ diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab index 66bc563..32aedee 100644 --- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab +++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab @@ -48,7 +48,7 @@ ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 0 useRigidbodyForVelocity: 1 @@ -4949,7 +4949,7 @@ ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 0 useRigidbodyForVelocity: 1 @@ -9823,7 +9823,7 @@ ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 useRigidbodyForVelocity: 1 @@ -14648,7 +14648,7 @@ ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 useRigidbodyForVelocity: 1 @@ -19473,7 +19473,7 @@ ringBufferLoopRange: {x: 0, y: 1} looping: 1 prewarm: 0 - playOnAwake: 1 + playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 0 useRigidbodyForVelocity: 1 diff --git a/Assets/Resources/Prefabs/Enemies/101.prefab b/Assets/Resources/Prefabs/Enemies/101.prefab index e30ae8b..0dec97e 100644 --- a/Assets/Resources/Prefabs/Enemies/101.prefab +++ b/Assets/Resources/Prefabs/Enemies/101.prefab @@ -186,10 +186,10 @@ - {fileID: 1277171420674534872} - {fileID: 6542537011048626110} - {fileID: 2982453381423257457} - - {fileID: 6679120199681160672} - {fileID: 6178603281983929972} - {fileID: 4595872435068790202} - {fileID: 5082303117693606609} + - {fileID: 2646001768961797160} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -244,8 +244,7 @@ commonTex: {fileID: 2800000, guid: 923815e19a1495543a0161d1c532893f, type: 3} PoisonParticle: {fileID: 1718302357907514560} PoisonEndParticle: {fileID: 5935093508862825476} - SlowDownParticle: {fileID: 6886032031065297259} - FrostParticle: {fileID: 4595872434723685104} + SlowDownParticle: {fileID: 2646001767007668901} FireSkillParticle: {fileID: 6178603283043088035} bShowDebugNode: 0 WoodAimEffect: {fileID: 7957212317602472358} @@ -628,7 +627,7 @@ - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} @@ -795,6 +794,102 @@ type: 3} m_PrefabInstance: {fileID: 4229842640979356525} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5345525922901173977 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8434816861478773449} + m_Modifications: + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.34 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332342, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_Name + value: Effect_Elf_Shui_Buff + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5480c96ebabda5a41a64d1dfa3a8165c, type: 3} +--- !u!4 &2646001768961797160 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + m_PrefabInstance: {fileID: 5345525922901173977} + m_PrefabAsset: {fileID: 0} +--- !u!198 &2646001767007668901 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 7968947019473939580, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + m_PrefabInstance: {fileID: 5345525922901173977} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6146236397121986736 PrefabInstance: m_ObjectHideFlags: 0 @@ -840,7 +935,7 @@ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} @@ -867,12 +962,6 @@ --- !u!4 &4595872435068790202 stripped Transform: m_CorrespondingSourceObject: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, - type: 3} - m_PrefabInstance: {fileID: 6146236397121986736} - m_PrefabAsset: {fileID: 0} ---- !u!198 &4595872434723685104 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} m_PrefabInstance: {fileID: 6146236397121986736} m_PrefabAsset: {fileID: 0} @@ -921,7 +1010,7 @@ - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} @@ -971,150 +1060,4 @@ m_CorrespondingSourceObject: {fileID: 2639904808709911356, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} m_PrefabInstance: {fileID: 8150421983870813599} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8970689413692267143 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8434816861478773449} - m_Modifications: - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.506 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.x - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.z - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.95 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.3 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_Name - value: Effect_jiansu1026 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.85 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 393d187774e421848be71dd6a69be174, type: 3} ---- !u!4 &6679120199681160672 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 8970689413692267143} - m_PrefabAsset: {fileID: 0} ---- !u!198 &6886032031065297259 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 2589099023883815916, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 8970689413692267143} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Enemies/102.prefab b/Assets/Resources/Prefabs/Enemies/102.prefab index f2cdbbd..131aeb3 100644 --- a/Assets/Resources/Prefabs/Enemies/102.prefab +++ b/Assets/Resources/Prefabs/Enemies/102.prefab @@ -186,10 +186,10 @@ - {fileID: 1277171420674534872} - {fileID: 772091675164355399} - {fileID: 5468027130051431602} - - {fileID: 200673849226178847} - {fileID: 4964518330195590823} - {fileID: 5004668289563595669} - {fileID: 3975245472824591526} + - {fileID: 2649315972506069566} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -244,8 +244,7 @@ commonTex: {fileID: 2800000, guid: 26688e577f01c9a41a04dd9401b7b49a, type: 3} PoisonParticle: {fileID: 5162362214322550841} PoisonEndParticle: {fileID: 3520733133352832967} - SlowDownParticle: {fileID: 137911762185639316} - FrostParticle: {fileID: 5004668289929344223} + SlowDownParticle: {fileID: 2649315973621320883} FireSkillParticle: {fileID: 4964518329174177392} bShowDebugNode: 0 WoodAimEffect: {fileID: 2288018833283399633} @@ -407,152 +406,6 @@ serializedVersion: 2 m_Radius: 0 m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &2452110888275779192 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8434816861478773449} - m_Modifications: - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.57 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.15 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.y - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.z - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.59 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.12 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.08 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_Name - value: Effect_jiansu1026 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.85 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 393d187774e421848be71dd6a69be174, type: 3} ---- !u!4 &200673849226178847 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 2452110888275779192} - m_PrefabAsset: {fileID: 0} ---- !u!198 &137911762185639316 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 2589099023883815916, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 2452110888275779192} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3456556258320520863 PrefabInstance: m_ObjectHideFlags: 0 @@ -603,7 +456,7 @@ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} @@ -633,11 +486,101 @@ type: 3} m_PrefabInstance: {fileID: 3456556258320520863} m_PrefabAsset: {fileID: 0} ---- !u!198 &5004668289929344223 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6, +--- !u!1001 &5355661493223383247 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8434816861478773449} + m_Modifications: + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.67 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.76 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332342, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_Name + value: Effect_Elf_Shui_Buff + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5480c96ebabda5a41a64d1dfa3a8165c, type: 3} +--- !u!4 &2649315972506069566 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, type: 3} - m_PrefabInstance: {fileID: 3456556258320520863} + m_PrefabInstance: {fileID: 5355661493223383247} + m_PrefabAsset: {fileID: 0} +--- !u!198 &2649315973621320883 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 7968947019473939580, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + m_PrefabInstance: {fileID: 5355661493223383247} m_PrefabAsset: {fileID: 0} --- !u!1001 &6288271352030446409 PrefabInstance: @@ -699,7 +642,7 @@ - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} @@ -1072,7 +1015,7 @@ - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} diff --git a/Assets/Resources/Prefabs/Enemies/103.prefab b/Assets/Resources/Prefabs/Enemies/103.prefab index 5e2d620..d8074dd 100644 --- a/Assets/Resources/Prefabs/Enemies/103.prefab +++ b/Assets/Resources/Prefabs/Enemies/103.prefab @@ -186,10 +186,10 @@ - {fileID: 1277171420674534872} - {fileID: 2909016453797189899} - {fileID: 1774749892824093657} - - {fileID: 5729843628970712658} - {fileID: 8244594842321693027} - {fileID: 3207871016240874820} - {fileID: 4529677448873523017} + - {fileID: 3131804371890025201} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -244,8 +244,7 @@ commonTex: {fileID: 2800000, guid: 30f4f867fda6b084dbdeeafa64ca5051, type: 3} PoisonParticle: {fileID: 7299639356303870581} PoisonEndParticle: {fileID: 7178544336952021164} - SlowDownParticle: {fileID: 5522934476590545625} - FrostParticle: {fileID: 3207871016062738958} + SlowDownParticle: {fileID: 3131804372267996284} FireSkillParticle: {fileID: 8244594841270657460} bShowDebugNode: 0 WoodAimEffect: {fileID: 1600713078188936254} @@ -523,6 +522,102 @@ type: 3} m_PrefabInstance: {fileID: 824593498719907781} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5035310720324630528 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8434816861478773449} + m_Modifications: + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.39 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.33 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 7968947019147332342, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + propertyPath: m_Name + value: Effect_Elf_Shui_Buff + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5480c96ebabda5a41a64d1dfa3a8165c, type: 3} +--- !u!4 &3131804371890025201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7968947019147332337, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + m_PrefabInstance: {fileID: 5035310720324630528} + m_PrefabAsset: {fileID: 0} +--- !u!198 &3131804372267996284 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 7968947019473939580, guid: 5480c96ebabda5a41a64d1dfa3a8165c, + type: 3} + m_PrefabInstance: {fileID: 5035310720324630528} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5046465214892965966 PrefabInstance: m_ObjectHideFlags: 0 @@ -568,7 +663,7 @@ - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} @@ -595,12 +690,6 @@ --- !u!4 &3207871016240874820 stripped Transform: m_CorrespondingSourceObject: {fileID: 7677512363771200778, guid: 2acf016d8917a714bbc5a6aa7e43aed6, - type: 3} - m_PrefabInstance: {fileID: 5046465214892965966} - m_PrefabAsset: {fileID: 0} ---- !u!198 &3207871016062738958 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 7677512363561411136, guid: 2acf016d8917a714bbc5a6aa7e43aed6, type: 3} m_PrefabInstance: {fileID: 5046465214892965966} m_PrefabAsset: {fileID: 0} @@ -649,7 +738,7 @@ - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf, type: 3} @@ -750,7 +839,7 @@ - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6948638370255521775, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} @@ -795,147 +884,6 @@ m_CorrespondingSourceObject: {fileID: 5225513106335661208, guid: e21fbc9a859eff446afa87a1208106b9, type: 3} m_PrefabInstance: {fileID: 6823552032382578854} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8019561273946026293 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8434816861478773449} - m_Modifications: - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.301 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.113 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.x - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalScale.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3586602713514068837, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 4473535568327097252, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.26 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: scalingMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5048851361003543717, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: playOnAwake - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_Name - value: Effect_jiansu1026 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8654898640768143987, guid: 393d187774e421848be71dd6a69be174, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.85 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 393d187774e421848be71dd6a69be174, type: 3} ---- !u!4 &5729843628970712658 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2364189766659714919, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 8019561273946026293} - m_PrefabAsset: {fileID: 0} ---- !u!198 &5522934476590545625 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 2589099023883815916, guid: 393d187774e421848be71dd6a69be174, - type: 3} - m_PrefabInstance: {fileID: 8019561273946026293} m_PrefabAsset: {fileID: 0} --- !u!1001 &8918806629018678469 PrefabInstance: diff --git a/GemBattle.7z b/GemBattle.7z index 0b35fa9..58cb797 100644 --- a/GemBattle.7z +++ b/GemBattle.7z Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" index b1461a3..d58f8b5 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" index 2b44a11..388d490 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" index 0d3392e..692b6fe 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" index 1ab8c3a..ead7ee1 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" index 510c2d6..301e5bf 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" index 996b32c..e1fd3e7 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" index f01f91b..885270f 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" index 032cd21..5e962be 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" index 3701ab3..04658d6 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" index f388864..23e311a 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" index 6c0b020..41f23c2 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" index af8e8c7..b8a1393 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" Binary files differ diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" index 52cf0d6..4b8c63d 100644 --- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" +++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" Binary files differ -- Gitblit v1.9.1