Merge remote-tracking branch 'origin/xjr'

# Conflicts:
#	BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

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

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4933060154975870342}
-  m_LocalRotation: {x: 0.2207927, y: -0.2207927, z: -0.6717519, w: -0.6717519}
-  m_LocalPosition: {x: -0.022000022, y: 0.119921684, z: 0.07497689}
+  m_LocalRotation: {x: 0.14560042, y: -0.14560033, z: -0.6919545, w: -0.6919539}
+  m_LocalPosition: {x: 0.030800037, y: 0.1331, z: 0.0566}
   m_LocalScale: {x: 0.49999988, y: 0.49999994, z: 0.5}
   m_Children: []
   m_Father: {fileID: 6715152333382017213}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -156.234, y: -180, z: -90}
 --- !u!198 &6787267316925552007
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -4733,14 +4733,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7079061562166580387}
-  m_LocalRotation: {x: 0.17364816, y: 0, z: 0.9848078, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.2883669, y: 2.827, z: 1.0053025}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6715152333382017213}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 20, z: 180}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7079061562166580385
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4818,14 +4818,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7740098556795032238}
-  m_LocalRotation: {x: 0.7064338, y: 0.7064338, z: 0.030843643, w: 0.030843643}
-  m_LocalPosition: {x: 0.078, y: -0.008, z: 0.040479343}
+  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_Children:
   - {fileID: 2769654101736037492}
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 175, z: 90}
+  m_LocalEulerAnglesHint: {x: 0, y: -120, z: -90}
 --- !u!33 &2335685709355145867
 MeshFilter:
   m_ObjectHideFlags: 0

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

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1380563897603376000}
-  m_LocalRotation: {x: 0.7064338, y: 0.7064338, z: 0.030843643, w: 0.030843643}
-  m_LocalPosition: {x: 0.078, y: -0.008, z: 0.040479343}
+  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_Children: []
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 175, z: 90}
+  m_LocalEulerAnglesHint: {x: 0, y: -120, z: -90}
 --- !u!33 &6352574574784744357
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -104,14 +104,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2572066776214124448}
-  m_LocalRotation: {x: 0.7064338, y: 0.7064338, z: 0.030843643, w: 0.030843643}
-  m_LocalPosition: {x: 0.078, y: -0.008, z: 0.040479343}
+  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_Children:
   - {fileID: 9048233084301330609}
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 175, z: 90}
+  m_LocalEulerAnglesHint: {x: 0, y: -120, z: -90}
 --- !u!33 &7543967518336647045
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -183,7 +183,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7079061562166580387}
-  m_LocalRotation: {x: 0.17364816, y: 0, z: 0.9848078, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.2883669, y: 2.827, z: 1.0053025}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -192,7 +192,7 @@ Transform:
   - {fileID: 1579224994360411571}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 20, z: 180}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7079061562166580385
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -270,14 +270,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7740098556795032238}
-  m_LocalRotation: {x: 0.7064338, y: 0.7064338, z: 0.030843643, w: 0.030843643}
-  m_LocalPosition: {x: 0.078, y: -0.008, z: 0.040479343}
+  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_Children:
   - {fileID: 2313354056716412296}
   m_Father: {fileID: 7079061562166580384}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 175, z: 90}
+  m_LocalEulerAnglesHint: {x: 0, y: -120, z: -90}
 --- !u!33 &2335685709355145867
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -350,13 +350,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8356835334378113772}
-  m_LocalRotation: {x: 0.2207927, y: -0.2207927, z: -0.6717519, w: -0.6717519}
-  m_LocalPosition: {x: -0.022000022, y: 0.119921684, z: 0.07497689}
+  m_LocalRotation: {x: 0.14560042, y: -0.14560033, z: -0.6919545, w: -0.6919539}
+  m_LocalPosition: {x: 0.030800037, y: 0.1331, z: 0.0566}
   m_LocalScale: {x: 0.49999988, y: 0.49999994, z: 0.5}
   m_Children: []
   m_Father: {fileID: 6715152333382017213}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -156.234, y: -180, z: -90}
 --- !u!198 &4503827145685970683
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -5059,13 +5059,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8933361592921291219}
-  m_LocalRotation: {x: 0.2207927, y: -0.2207927, z: -0.6717519, w: -0.6717519}
-  m_LocalPosition: {x: -0.022000022, y: 0.119921684, z: 0.07497689}
+  m_LocalRotation: {x: 0.14560042, y: -0.14560033, z: -0.6919545, w: -0.6919539}
+  m_LocalPosition: {x: 0.030800037, y: 0.1331, z: 0.0566}
   m_LocalScale: {x: 0.49999988, y: 0.49999994, z: 0.5}
   m_Children: []
   m_Father: {fileID: 1579224994360411571}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -156.234, y: -180, z: -90}
 --- !u!198 &4904598166357484859
 ParticleSystem:
   m_ObjectHideFlags: 0

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

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2301423527460881330}
-  m_LocalRotation: {x: -0.70682234, y: -0.020054892, z: 0.020054892, w: 0.70682234}
-  m_LocalPosition: {x: 0.028723476, y: 0.82007974, z: -0.17333347}
+  m_LocalRotation: {x: -0.707088, y: -0.0051521515, z: 0.0051521515, w: 0.707088}
+  m_LocalPosition: {x: -0.050000172, y: 0.61600006, z: 0.120000035}
   m_LocalScale: {x: 3.3333328, y: 3.333333, z: 3.3333328}
   m_Children: []
   m_Father: {fileID: 7197365952923948602}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -89.165, y: -90.00001, z: 90.00001}
 --- !u!198 &4926286595024384356
 ParticleSystem:
   m_ObjectHideFlags: 0

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

@@ -185,13 +185,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6945793147744643554}
-  m_LocalRotation: {x: -0.70682234, y: -0.020054892, z: 0.020054892, w: 0.70682234}
-  m_LocalPosition: {x: 0.028723476, y: 0.82007974, z: -0.17333347}
+  m_LocalRotation: {x: -0.707088, y: -0.0051521515, z: 0.0051521515, w: 0.707088}
+  m_LocalPosition: {x: -0.050000172, y: 0.61600006, z: 0.120000035}
   m_LocalScale: {x: 3.3333328, y: 3.333333, z: 3.3333328}
   m_Children: []
   m_Father: {fileID: 19298639023723774}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -89.165, y: -90.00001, z: 90.00001}
 --- !u!198 &8747669872798758865
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -5059,13 +5059,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8356835334378113772}
-  m_LocalRotation: {x: -0.70682234, y: -0.020054892, z: 0.020054892, w: 0.70682234}
-  m_LocalPosition: {x: 0.028723476, y: 0.82007974, z: -0.17333347}
+  m_LocalRotation: {x: -0.707088, y: -0.0051521515, z: 0.0051521515, w: 0.707088}
+  m_LocalPosition: {x: -0.050000172, y: 0.61600006, z: 0.120000035}
   m_LocalScale: {x: 3.3333328, y: 3.333333, z: 3.3333328}
   m_Children: []
   m_Father: {fileID: 7197365952923948602}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -89.165, y: -90.00001, z: 90.00001}
 --- !u!198 &4503827145685970683
 ParticleSystem:
   m_ObjectHideFlags: 0

BoomMaster/Assets/#A3_Prefabs/Bomb.prefab

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2301423527460881330}
-  m_LocalRotation: {x: -0.70682234, y: -0.020054892, z: 0.020054892, w: 0.70682234}
-  m_LocalPosition: {x: 0.028723476, y: 0.82007974, z: -0.17333347}
+  m_LocalRotation: {x: -0.707088, y: -0.0051521515, z: 0.0051521515, w: 0.707088}
+  m_LocalPosition: {x: -0.050000172, y: 0.61600006, z: 0.120000035}
   m_LocalScale: {x: 3.3333328, y: 3.333333, z: 3.3333328}
   m_Children: []
   m_Father: {fileID: 7197365952923948602}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -89.165, y: -90.00001, z: 90.00001}
 --- !u!198 &4926286595024384356
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -4734,13 +4734,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4933060154975870342}
-  m_LocalRotation: {x: 0.2207927, y: -0.2207927, z: -0.6717519, w: -0.6717519}
-  m_LocalPosition: {x: -0.022000022, y: 0.119921684, z: 0.07497689}
+  m_LocalRotation: {x: 0.14560042, y: -0.14560033, z: -0.6919545, w: -0.6919539}
+  m_LocalPosition: {x: 0.030800037, y: 0.1331, z: 0.0566}
   m_LocalScale: {x: 0.49999988, y: 0.49999994, z: 0.5}
   m_Children: []
   m_Father: {fileID: 6715152333382017213}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: -180, y: -41.390015, z: 0}
+  m_LocalEulerAnglesHint: {x: -156.234, y: -180, z: -90}
 --- !u!198 &6787267316925552007
 ParticleSystem:
   m_ObjectHideFlags: 0

BoomMaster/Assets/#A3_Prefabs/BombView.prefab

@@ -293,22 +293,22 @@ PrefabInstance:
     - target: {fileID: 1579224994360411571, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7064338
+      value: 0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 1579224994360411571, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7064338
+      value: -0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 1579224994360411571, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.030843643
+      value: -0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 1579224994360411571, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.030843643
+      value: 0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 1579224994360411571, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
@@ -338,22 +338,22 @@ PrefabInstance:
     - target: {fileID: 2698753850410938771, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7064338
+      value: 0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 2698753850410938771, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7064338
+      value: -0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 2698753850410938771, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.030843643
+      value: -0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 2698753850410938771, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.030843643
+      value: 0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 2698753850410938771, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
@@ -378,22 +378,22 @@ PrefabInstance:
     - target: {fileID: 6715152333382017213, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7064338
+      value: 0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7064338
+      value: -0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.030843643
+      value: -0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.030843643
+      value: 0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: f89cb61f7a571bf48a3e81af6d085bbe,
         type: 3}
@@ -650,22 +650,22 @@ PrefabInstance:
     - target: {fileID: 6715152333382017213, guid: 1fb8d1385462d7747977b6c578c922d1,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7064338
+      value: 0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: 1fb8d1385462d7747977b6c578c922d1,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7064338
+      value: -0.61237246
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: 1fb8d1385462d7747977b6c578c922d1,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.030843643
+      value: -0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: 1fb8d1385462d7747977b6c578c922d1,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.030843643
+      value: 0.35355335
       objectReference: {fileID: 0}
     - target: {fileID: 6715152333382017213, guid: 1fb8d1385462d7747977b6c578c922d1,
         type: 3}

BoomMaster/Assets/#C3_Materials/Texture/Line.png.meta

+fileFormatVersion: 2
+guid: 570b4636d441b4a49af82194d8862d8f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BoomMaster/Assets/#C3_Materials/game/Line.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Line
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Detail:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FoamTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _LightTex:
+        m_Texture: {fileID: 2800000, guid: 570b4636d441b4a49af82194d8862d8f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 570b4636d441b4a49af82194d8862d8f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 2800000, guid: 570b4636d441b4a49af82194d8862d8f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AllPower: 1
+    - _AlphaPower: 4
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DepthDistance: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _FoamSmooth: 0.02
+    - _FoamSpread: 2
+    - _FoamStrength: 0.8
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _InnerColorPower: 0.5
+    - _LightWidth: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RampSmooth: 0.1
+    - _RampThreshold: 0.5
+    - _RimMax: 1
+    - _RimMin: 0.5
+    - _RimPower: 2.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SpeedX: 0
+    - _SpeedY: 0
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _UVWaveAmplitude: 0.05
+    - _UVWaveFrequency: 1
+    - _UVWaveSpeed: 1
+    - _WaveFrequency: 1
+    - _WaveHeight: 0.1
+    - _WaveSpeed: 2
+    - _ZWrite: 1
+    - __dummy__: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _ColorTint: {r: 0.6, g: 0.3, b: 0.6, a: 0.3}
+    - _DepthColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FoamColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
+    - _FoamSpeed: {r: 2, g: 2, b: 2, a: 2}
+    - _HColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+    - _InnerColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+    - _MoveLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+    - _SColor: {r: 0.3, g: 0.3, b: 0.3, a: 1}

BoomMaster/Assets/#C3_Materials/game/Line.mat.meta

+fileFormatVersion: 2
+guid: 99cdb6b0f49b5054f839e6ff4903abd9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: