1

Assets/Plugins/UnityPurchasing/ETag

@@ -1 +1 @@
-"26f46597fa31235cfc86335f685056ae"
+"61cb55362fb219b87ca4fec7f729d99b"

Assets/ScenesNew/Base/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c5fbe7827d4169647a801ec8be07861d
-timeCreated: 1495713299
+timeCreated: 1495872169
 licenseType: Pro
 NativeFormatImporter:
   userData: 

Assets/ScenesNew/Base/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e66f723ca1782bb428288896f414a62e
-timeCreated: 1495713259
+timeCreated: 1495872128
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

Assets/ScenesNew/Base/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b369976f54e0e144b87349a20fe1dd19
-timeCreated: 1495713299
+timeCreated: 1495872168
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

Assets/ScenesNew/Challenge/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 9b69c098db4b9384b8fe2db0e389dd9d
-timeCreated: 1495713776
+timeCreated: 1496677439
 licenseType: Pro
 NativeFormatImporter:
   userData: 

Assets/ScenesNew/Challenge/Lightmap-0_comp_dir.png.meta

@@ -1,68 +0,0 @@
-fileFormatVersion: 2
-guid: b6a3cc377fffbc54b9d0be178084b3f6
-timeCreated: 1495713738
-licenseType: Pro
-TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapMode: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ScenesNew/Challenge/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4058dbe856bb9304a8b45ef2843780db
-timeCreated: 1495713738
+timeCreated: 1496677403
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

Assets/ScenesNew/Base/Lightmap-0_comp_dir.png.meta → Assets/ScenesNew/Challenge/Lightmap-1_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 284a00f120507314d88d5d544fcbd082
-timeCreated: 1495713259
+guid: 8c45913a86b3f8f4e882268d4bd13601
+timeCreated: 1496677404
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -8,7 +8,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -41,10 +41,10 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaUsage: 1
+  alphaUsage: 0
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 6
   textureShape: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0

Assets/ScenesNew/Challenge/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a98cb6e661e41f544903026d95686c7e
-timeCreated: 1495713775
+timeCreated: 1496677439
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

Assets/Scripts/Battle/Map/BattleObject.cs

@@ -221,10 +221,13 @@ public class BattleObject : MapObject, IBattleObject , ITarget
 	//hp & mp
 	public void InitHeadBar()
 	{
-		GameObject headBarPrefab = Resources.Load(Config.HEAD_BAR_PREFAB) as GameObject;
-		GameObject headBarObj = Instantiate(headBarPrefab) as GameObject;
-		PopUpManager.AddToMainCanvas (headBarObj);
-		headBar = headBarObj.GetComponent<HeadBar>();
+		if(headBar == null)
+		{
+			GameObject headBarPrefab = Resources.Load(Config.HEAD_BAR_PREFAB) as GameObject;
+			GameObject headBarObj = Instantiate(headBarPrefab) as GameObject;
+			PopUpManager.AddToMainCanvas (headBarObj);
+			headBar = headBarObj.GetComponent<HeadBar>();
+		}
 		headBar.Init(this);
 	}
 

Assets/Scripts/Net/Message/MessageManager.cs

@@ -954,7 +954,6 @@ public class MessageManager
 				player.station++;
 				string colorStr = TeamUtil.GetTeamColorString(player.team);
 				string info = Language.GetStr("GameInfo", "occupy");
-				info = info.Replace("%DIRECTION%", Language.GetStr(map.id.ToString(), "station"+station.crystalBase.id));
 				if(player.userId == myUserId)
 				{
 					info = info.Replace("%NAME%", Language.GetStr("GameInfo", "you"));