Merge commit '9d95d483'

BoomMaster/Assets/#A3_Prefabs/Bomb 1_create.prefab

@@ -4820,7 +4820,7 @@ Transform:
   m_GameObject: {fileID: 7740098556795032238}
   m_LocalRotation: {x: 0.61237246, y: -0.61237246, z: -0.35355335, w: 0.35355335}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalScale: {x: 2.4, y: 2.4, z: 2.4}
   m_Children:
   - {fileID: 2769654101736037492}
   m_Father: {fileID: 7079061562166580384}

BoomMaster/Assets/#A3_Prefabs/Bomb 1_state.prefab

@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 1380563897603376000}
   m_LocalRotation: {x: 0.61237246, y: -0.61237246, z: -0.35355335, w: 0.35355335}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalScale: {x: 2.4, y: 2.4, z: 2.4}
   m_Children: []
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 1
@@ -106,7 +106,7 @@ Transform:
   m_GameObject: {fileID: 2572066776214124448}
   m_LocalRotation: {x: 0.61237246, y: -0.61237246, z: -0.35355335, w: 0.35355335}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalScale: {x: 2.4, y: 2.4, z: 2.4}
   m_Children:
   - {fileID: 9048233084301330609}
   m_Father: {fileID: 7079061562166580384}
@@ -272,7 +272,7 @@ Transform:
   m_GameObject: {fileID: 7740098556795032238}
   m_LocalRotation: {x: 0.61237246, y: -0.61237246, z: -0.35355335, w: 0.35355335}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalScale: {x: 2.4, y: 2.4, z: 2.4}
   m_Children:
   - {fileID: 2313354056716412296}
   m_Father: {fileID: 7079061562166580384}

BoomMaster/Assets/#A3_Prefabs/Bomb 2_create.prefab

@@ -4736,7 +4736,7 @@ Transform:
   m_GameObject: {fileID: 6177100217281881129}
   m_LocalRotation: {x: -0.6541284, y: -0.26854438, z: -0.26854438, w: 0.6541284}
   m_LocalPosition: {x: 0.151, y: 0, z: 0.081}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 5779523333927494769}
   m_Father: {fileID: 7079061562166580384}

BoomMaster/Assets/#A3_Prefabs/Bomb 2_state.prefab

@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 1420529887784535928}
   m_LocalRotation: {x: -0.6541284, y: -0.26854438, z: -0.26854438, w: 0.6541284}
   m_LocalPosition: {x: 0.151, y: 0, z: 0.081}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 5114126517199320791}
   m_Father: {fileID: 7079061562166580384}
@@ -107,7 +107,7 @@ Transform:
   m_GameObject: {fileID: 6177100217281881129}
   m_LocalRotation: {x: -0.6541284, y: -0.26854438, z: -0.26854438, w: 0.6541284}
   m_LocalPosition: {x: 0.151, y: 0, z: 0.081}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children:
   - {fileID: 2313354056716412296}
   m_Father: {fileID: 7079061562166580384}
@@ -4982,7 +4982,7 @@ Transform:
   m_GameObject: {fileID: 7523547767174006017}
   m_LocalRotation: {x: -0.6541284, y: -0.26854438, z: -0.26854438, w: 0.6541284}
   m_LocalPosition: {x: 0.151, y: 0, z: 0.081}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
   m_Children: []
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 1

BoomMaster/Assets/#A3_Prefabs/Bomb 3_create.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &4575191947354266355
+--- !u!1 &4587193679013363977
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,46 +8,46 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4575191947353835219}
-  - component: {fileID: 4575191947357226739}
-  - component: {fileID: 4575191947356259379}
+  - component: {fileID: 717098735763763994}
+  - component: {fileID: 8406148196016556332}
+  - component: {fileID: 2851951006111004117}
   m_Layer: 0
-  m_Name: Rocket06
+  m_Name: SM_Prop_Bomb_03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4575191947353835219
+--- !u!4 &717098735763763994
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4575191947354266355}
-  m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
-  m_LocalPosition: {x: 0.229, y: 0, z: 0.024}
-  m_LocalScale: {x: 0.22, y: 0.22, z: 0.22}
+  m_GameObject: {fileID: 4587193679013363977}
+  m_LocalRotation: {x: -0.5735764, y: -0, z: 0.8191521, w: 0}
+  m_LocalPosition: {x: -0.311, y: 0.385, z: 0.113}
+  m_LocalScale: {x: 3, y: 3, z: 3}
   m_Children:
   - {fileID: 2769654101736037492}
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
---- !u!33 &4575191947357226739
+  m_LocalEulerAnglesHint: {x: 0, y: -70, z: 180}
+--- !u!33 &8406148196016556332
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4575191947354266355}
-  m_Mesh: {fileID: 4300000, guid: 0094b425812d49548913a84e817fac7e, type: 3}
---- !u!23 &4575191947356259379
+  m_GameObject: {fileID: 4587193679013363977}
+  m_Mesh: {fileID: 8356499728866282311, guid: c8d54827e799e1f4f831ee59069277cd, type: 3}
+--- !u!23 &2851951006111004117
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4575191947354266355}
+  m_GameObject: {fileID: 4587193679013363977}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -105,13 +105,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4933060154975870342}
-  m_LocalRotation: {x: 0.00000041723246, y: 0.9686579, z: 0.00000004470348, w: -0.24839881}
-  m_LocalPosition: {x: 0.93, y: -0.2436367, z: -0.26}
-  m_LocalScale: {x: 5, y: 5, z: 5}
+  m_LocalRotation: {x: -0, y: -1, z: 0, w: 0}
+  m_LocalPosition: {x: 0.07, y: 0.3929, z: 0.05}
+  m_LocalScale: {x: 0.3666667, y: 0.36666667, z: 0.3666667}
   m_Children: []
-  m_Father: {fileID: 4575191947353835219}
+  m_Father: {fileID: 717098735763763994}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -156.234, y: -180, z: -90}
+  m_LocalEulerAnglesHint: {x: -180, y: 0, z: -180}
 --- !u!198 &6787267316925552007
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -4817,7 +4817,7 @@ Transform:
   m_LocalPosition: {x: 1.2883669, y: 2.827, z: 1.0053025}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4575191947353835219}
+  - {fileID: 717098735763763994}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 20, z: 180}

BoomMaster/Assets/#A3_Prefabs/Bomb 3_eff.prefab

@@ -9536,7 +9536,6 @@ GameObject:
   - component: {fileID: 1341771435823194062}
   - component: {fileID: 1341771435842555846}
   - component: {fileID: 1341771435843427182}
-  - component: {fileID: 1341771435833613690}
   m_Layer: 0
   m_Name: light
   m_TagString: Untagged
@@ -14266,67 +14265,6 @@ ParticleSystemRenderer:
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
   m_MaskInteraction: 0
---- !u!108 &1341771435833613690
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1341771435823368838}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 2
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.39310342, b: 0, a: 1}
-  m_Intensity: 7
-  m_Range: 16
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
 --- !u!1 &1341771435823533128
 GameObject:
   m_ObjectHideFlags: 0
@@ -19098,7 +19036,7 @@ ParticleSystem:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1341771435823553848}
   serializedVersion: 6
-  lengthInSec: 2
+  lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 1
@@ -28515,7 +28453,7 @@ ParticleSystem:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4754847857784992510}
   serializedVersion: 6
-  lengthInSec: 2
+  lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 1
@@ -52227,7 +52165,7 @@ ParticleSystem:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8883118796573031006}
   serializedVersion: 6
-  lengthInSec: 2
+  lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 3
@@ -56985,7 +56923,7 @@ ParticleSystem:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8883118796573043102}
   serializedVersion: 6
-  lengthInSec: 2
+  lengthInSec: 1
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 1

BoomMaster/Assets/#C1_Models/Bomb/Rocket06.fbx.meta → BoomMaster/Assets/#C1_Models/Bomb/SM_Prop_Bomb_03.fbx.meta

 fileFormatVersion: 2
-guid: 0094b425812d49548913a84e817fac7e
+guid: c8d54827e799e1f4f831ee59069277cd
 ModelImporter:
-  serializedVersion: 22
-  fileIDToRecycleName:
-    100000: //RootNode
-    100002: Cube
-    100004: Point
-    100006: Point.001
-    100008: Rocket01
-    100010: Rocket02
-    100012: Rocket03
-    100014: Rocket04
-    100016: Rocket05
-    100018: Rocket06
-    100020: Rocket07
-    100022: Rocket08
-    100024: Rocket09
-    100026: Rocket10
-    100028: Rocket11
-    100030: Rocket12
-    100032: Rocket13
-    100034: Rocket14
-    100036: Rocket15
-    100038: Rocket16
-    100040: Rocket17
-    100042: Rocket18
-    100044: Rocket19
-    100046: Rocket20
-    100048: Rocket21
-    100050: Rocket22
-    100052: Rocket23
-    100054: Rocket24
-    100056: Rocket25
-    100058: Rocket26
-    100060: Rocket27
-    100062: Rocket28
-    100064: Rocket29
-    100066: Rocket30
-    100068: Sun
-    400000: //RootNode
-    400002: Cube
-    400004: Point
-    400006: Point.001
-    400008: Rocket01
-    400010: Rocket02
-    400012: Rocket03
-    400014: Rocket04
-    400016: Rocket05
-    400018: Rocket06
-    400020: Rocket07
-    400022: Rocket08
-    400024: Rocket09
-    400026: Rocket10
-    400028: Rocket11
-    400030: Rocket12
-    400032: Rocket13
-    400034: Rocket14
-    400036: Rocket15
-    400038: Rocket16
-    400040: Rocket17
-    400042: Rocket18
-    400044: Rocket19
-    400046: Rocket20
-    400048: Rocket21
-    400050: Rocket22
-    400052: Rocket23
-    400054: Rocket24
-    400056: Rocket25
-    400058: Rocket26
-    400060: Rocket27
-    400062: Rocket28
-    400064: Rocket29
-    400066: Rocket30
-    400068: Sun
-    2100000: MainMaterial
-    2100002: Material.015
-    2300000: //RootNode
-    2300002: Cube
-    2300004: Rocket01
-    2300006: Rocket02
-    2300008: Rocket03
-    2300010: Rocket04
-    2300012: Rocket05
-    2300014: Rocket06
-    2300016: Rocket07
-    2300018: Rocket08
-    2300020: Rocket09
-    2300022: Rocket10
-    2300024: Rocket11
-    2300026: Rocket12
-    2300028: Rocket13
-    2300030: Rocket14
-    2300032: Rocket15
-    2300034: Rocket16
-    2300036: Rocket17
-    2300038: Rocket18
-    2300040: Rocket19
-    2300042: Rocket20
-    2300044: Rocket21
-    2300046: Rocket22
-    2300048: Rocket23
-    2300050: Rocket24
-    2300052: Rocket25
-    2300054: Rocket26
-    2300056: Rocket27
-    2300058: Rocket28
-    2300060: Rocket29
-    2300062: Rocket30
-    3300000: //RootNode
-    3300002: Cube
-    3300004: Rocket01
-    3300006: Rocket02
-    3300008: Rocket03
-    3300010: Rocket04
-    3300012: Rocket05
-    3300014: Rocket06
-    3300016: Rocket07
-    3300018: Rocket08
-    3300020: Rocket09
-    3300022: Rocket10
-    3300024: Rocket11
-    3300026: Rocket12
-    3300028: Rocket13
-    3300030: Rocket14
-    3300032: Rocket15
-    3300034: Rocket16
-    3300036: Rocket17
-    3300038: Rocket18
-    3300040: Rocket19
-    3300042: Rocket20
-    3300044: Rocket21
-    3300046: Rocket22
-    3300048: Rocket23
-    3300050: Rocket24
-    3300052: Rocket25
-    3300054: Rocket26
-    3300056: Rocket27
-    3300058: Rocket28
-    3300060: Rocket29
-    3300062: Rocket30
-    4300000: Rocket06
-    4300002: Rocket30
-    4300004: Rocket29
-    4300006: Rocket28
-    4300008: Rocket27
-    4300010: Rocket26
-    4300012: Rocket25
-    4300014: Rocket23
-    4300016: Rocket22
-    4300018: Rocket21
-    4300020: Rocket19
-    4300022: Rocket18
-    4300024: Rocket17
-    4300026: Rocket16
-    4300028: Rocket14
-    4300030: Rocket13
-    4300032: Rocket11
-    4300034: Rocket12
-    4300036: Rocket10
-    4300038: Rocket03
-    4300040: Rocket01
-    4300042: Rocket04
-    4300044: Rocket02
-    4300046: Rocket09
-    4300048: Rocket15
-    4300050: Rocket05
-    4300052: Rocket20
-    4300054: Rocket24
-    4300056: Rocket07
-    4300058: Cube
-    4300060: Rocket08
-    10800000: Point
-    10800002: Point.001
-    10800004: Sun
-    2186277476908879412: ImportLogs
+  serializedVersion: 19300
+  internalIDToNameTable: []
   externalObjects: {}
   materials:
-    importMaterials: 1
+    materialImportMode: 1
     materialName: 0
     materialSearch: 1
     materialLocation: 1
@@ -208,17 +37,22 @@ ModelImporter:
     globalScale: 1
     meshCompression: 0
     addColliders: 0
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 0
+    importBlendShapes: 0
+    importCameras: 0
+    importLights: 0
     swapUVChannels: 0
     generateSecondaryUV: 0
     useFileUnits: 1
-    optimizeMeshForGPU: 1
     keepQuads: 0
     weldVertices: 1
     preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
     indexFormat: 0
     secondaryUVAngleDistortion: 8
     secondaryUVAreaDistortion: 15.000001
@@ -230,10 +64,13 @@ ModelImporter:
     normalImportMode: 0
     tangentImportMode: 3
     normalCalculationMode: 4
-  importAnimation: 1
-  copyAvatar: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 0
   humanDescription:
-    serializedVersion: 2
+    serializedVersion: 3
     human: []
     skeleton: []
     armTwist: 0.5
@@ -243,14 +80,16 @@ ModelImporter:
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
+    globalScale: 1
     rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1
   lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
   animationType: 0
   humanoidOversampling: 1
+  avatarSetup: 0
   additionalBone: 0
   userData: 
   assetBundleName: 

BoomMaster/Assets/#C3_Materials/Texture/RocketsPalletteRed.png.meta → BoomMaster/Assets/#C3_Materials/Texture/SM_Prop_Bomb_03.png.meta

 fileFormatVersion: 2
-guid: 87b14570171a8be458a29df2cd70f078
+guid: b10931cd289aa3b4493b5c2c0e893e64
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 5
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -21,6 +21,8 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,7 +33,7 @@ TextureImporter:
     serializedVersion: 2
     filterMode: -1
     aniso: -1
-    mipBias: -1
+    mipBias: -100
     wrapU: -1
     wrapV: -1
     wrapW: -1
@@ -55,8 +57,9 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  applyGammaDecoding: 0
   platformSettings:
-  - serializedVersion: 2
+  - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -67,6 +70,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -74,11 +78,15 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 
+    internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
+    secondaryTextures: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BoomMaster/Assets/#C3_Materials/bomb/Bomb1/Bomb1_AlphaMat 4.mat

@@ -58,7 +58,7 @@ Material:
     - _OutLightPow: 28.14
     - _OutLightStrength: 23.9
     - _Outline: 0.002
-    - _RimPower: 0.5
+    - _RimPower: 1
     - _Shininess: 0.802744
     - _Size: 0.1
     - _SpeedX: 0.36

BoomMaster/Assets/#C3_Materials/bomb/Bomb2/Bomb2_AlphaMat 4.mat

@@ -58,7 +58,7 @@ Material:
     - _OutLightPow: 28.14
     - _OutLightStrength: 23.9
     - _Outline: 0.002
-    - _RimPower: 0.5
+    - _RimPower: 1
     - _Shininess: 0.802744
     - _Size: 0.1
     - _SpeedX: 0.36

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3.mat

@@ -44,7 +44,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MaskTex:

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_AlphaMat 2.mat

@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: cf29d3cf76617fa479be7a301aa1ce64, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb_AlphaMat 3.mat → BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_AlphaMat 3.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Bomb_AlphaMat 3
+  m_Name: Bomb3_AlphaMat 3
   m_Shader: {fileID: 4800000, guid: b45e3a981ee9b2944a90283dfd808721, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_AlphaMat 4.mat

@@ -36,7 +36,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MaskTex:
@@ -58,7 +58,7 @@ Material:
     - _OutLightPow: 28.14
     - _OutLightStrength: 23.9
     - _Outline: 0.002
-    - _RimPower: 0.5
+    - _RimPower: 1
     - _Shininess: 0.802744
     - _Size: 0.1
     - _SpeedX: 0.36

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_Color.mat

@@ -24,7 +24,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats: []

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_Dissolve.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Ramp:

BoomMaster/Assets/#C3_Materials/bomb/Bomb3/Bomb3_light.mat

@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 87b14570171a8be458a29df2cd70f078, type: 3}
+        m_Texture: {fileID: 2800000, guid: b10931cd289aa3b4493b5c2c0e893e64, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MaskTex: