diff --git a/Assets/Content/Icons/Items/liveroom_coin.png b/Assets/Content/Icons/Items/liveroom_coin.png index 76a2c72de..35e804209 100644 Binary files a/Assets/Content/Icons/Items/liveroom_coin.png and b/Assets/Content/Icons/Items/liveroom_coin.png differ diff --git a/Assets/Content/Icons/Items/liveroom_coin.png.meta b/Assets/Content/Icons/Items/liveroom_coin.png.meta index e04f8e183..f48d5d90c 100644 --- a/Assets/Content/Icons/Items/liveroom_coin.png.meta +++ b/Assets/Content/Icons/Items/liveroom_coin.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,7 +82,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 12 textureCompression: 1 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,7 +121,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 47 textureCompression: 1 diff --git a/Assets/Content/Icons/Items/story_item_1.png b/Assets/Content/Icons/Items/story_item_1.png index c48f1fb7f..cc5c894a5 100644 Binary files a/Assets/Content/Icons/Items/story_item_1.png and b/Assets/Content/Icons/Items/story_item_1.png differ diff --git a/Assets/Content/Icons/Items/story_item_1.png.meta b/Assets/Content/Icons/Items/story_item_1.png.meta index a85e6f992..ddafc8755 100644 --- a/Assets/Content/Icons/Items/story_item_1.png.meta +++ b/Assets/Content/Icons/Items/story_item_1.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_2.png b/Assets/Content/Icons/Items/story_item_2.png index c6337760f..607e7f331 100644 Binary files a/Assets/Content/Icons/Items/story_item_2.png and b/Assets/Content/Icons/Items/story_item_2.png differ diff --git a/Assets/Content/Icons/Items/story_item_2.png.meta b/Assets/Content/Icons/Items/story_item_2.png.meta index e4603fa6c..8667c5f44 100644 --- a/Assets/Content/Icons/Items/story_item_2.png.meta +++ b/Assets/Content/Icons/Items/story_item_2.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_3.png b/Assets/Content/Icons/Items/story_item_3.png index 4cc111b00..c54b7156f 100644 Binary files a/Assets/Content/Icons/Items/story_item_3.png and b/Assets/Content/Icons/Items/story_item_3.png differ diff --git a/Assets/Content/Icons/Items/story_item_3.png.meta b/Assets/Content/Icons/Items/story_item_3.png.meta index 52679354c..c26180841 100644 --- a/Assets/Content/Icons/Items/story_item_3.png.meta +++ b/Assets/Content/Icons/Items/story_item_3.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_4.png b/Assets/Content/Icons/Items/story_item_4.png index a0f90b04a..48ccf3041 100644 Binary files a/Assets/Content/Icons/Items/story_item_4.png and b/Assets/Content/Icons/Items/story_item_4.png differ diff --git a/Assets/Content/Icons/Items/story_item_4.png.meta b/Assets/Content/Icons/Items/story_item_4.png.meta index 082ce859b..8464479c0 100644 --- a/Assets/Content/Icons/Items/story_item_4.png.meta +++ b/Assets/Content/Icons/Items/story_item_4.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_5.png b/Assets/Content/Icons/Items/story_item_5.png index 97df4644c..23955b15d 100644 Binary files a/Assets/Content/Icons/Items/story_item_5.png and b/Assets/Content/Icons/Items/story_item_5.png differ diff --git a/Assets/Content/Icons/Items/story_item_5.png.meta b/Assets/Content/Icons/Items/story_item_5.png.meta index fa1ca221e..382889ef7 100644 --- a/Assets/Content/Icons/Items/story_item_5.png.meta +++ b/Assets/Content/Icons/Items/story_item_5.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_6.png b/Assets/Content/Icons/Items/story_item_6.png index 2f7e43b12..56b6a3813 100644 Binary files a/Assets/Content/Icons/Items/story_item_6.png and b/Assets/Content/Icons/Items/story_item_6.png differ diff --git a/Assets/Content/Icons/Items/story_item_6.png.meta b/Assets/Content/Icons/Items/story_item_6.png.meta index c322faf0e..4f48769c6 100644 --- a/Assets/Content/Icons/Items/story_item_6.png.meta +++ b/Assets/Content/Icons/Items/story_item_6.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_7.png b/Assets/Content/Icons/Items/story_item_7.png index ce05d96dd..3f9392f2f 100644 Binary files a/Assets/Content/Icons/Items/story_item_7.png and b/Assets/Content/Icons/Items/story_item_7.png differ diff --git a/Assets/Content/Icons/Items/story_item_7.png.meta b/Assets/Content/Icons/Items/story_item_7.png.meta index 104663d91..ed6ae4a96 100644 --- a/Assets/Content/Icons/Items/story_item_7.png.meta +++ b/Assets/Content/Icons/Items/story_item_7.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Content/Icons/Items/story_item_8.png b/Assets/Content/Icons/Items/story_item_8.png index 24751ca00..a045bea3d 100644 Binary files a/Assets/Content/Icons/Items/story_item_8.png and b/Assets/Content/Icons/Items/story_item_8.png differ diff --git a/Assets/Content/Icons/Items/story_item_8.png.meta b/Assets/Content/Icons/Items/story_item_8.png.meta index 6a6483579..fbf5fcfb2 100644 --- a/Assets/Content/Icons/Items/story_item_8.png.meta +++ b/Assets/Content/Icons/Items/story_item_8.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -82,9 +82,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 10 + textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -121,9 +121,9 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/Src/GameLogic/Battle/FighterManager/FighterManager.cs b/Assets/Src/GameLogic/Battle/FighterManager/FighterManager.cs index 1a731f907..f2d250286 100644 --- a/Assets/Src/GameLogic/Battle/FighterManager/FighterManager.cs +++ b/Assets/Src/GameLogic/Battle/FighterManager/FighterManager.cs @@ -500,9 +500,9 @@ public class FighterManager public void OnFighterDie(Fighter fighter) { - Debug.Log("tzy_角色死亡_1"); - if (mBattle.IsNormalBattle) Debug.Log("tzy_角色死亡_2 " + fighter); - if (mBattle.IsNormalBattle && fighter.IsNpc) Debug.Log("tzy_角色死亡_3 "); + // Debug.Log("tzy_角色死亡_1"); + // if (mBattle.IsNormalBattle) Debug.Log("tzy_角色死亡_2 " + fighter); + // if (mBattle.IsNormalBattle && fighter.IsNpc) Debug.Log("tzy_角色死亡_3 "); if (mBattle.IsNormalBattle && fighter.IsNpc) { Vector3 startpos, goldpos, emptypos;