diff --git a/Assets/GWConquest/Prefabs/Battle.prefab b/Assets/GWConquest/Prefabs/Battle.prefab index 8c01253..04505ec 100644 --- a/Assets/GWConquest/Prefabs/Battle.prefab +++ b/Assets/GWConquest/Prefabs/Battle.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 872.81177, y: -2957.7178, z: 666.5928} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/GWConquest/Prefabs/BattleFlank.prefab b/Assets/GWConquest/Prefabs/BattleFlank.prefab index 65ba841..c8b4728 100644 --- a/Assets/GWConquest/Prefabs/BattleFlank.prefab +++ b/Assets/GWConquest/Prefabs/BattleFlank.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/GWConquest/Prefabs/District.prefab b/Assets/GWConquest/Prefabs/District.prefab index 075aea5..d63d512 100644 --- a/Assets/GWConquest/Prefabs/District.prefab +++ b/Assets/GWConquest/Prefabs/District.prefab @@ -30,6 +30,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1023.8419, y: -3261.8594, z: 3024.7632} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -80,6 +81,7 @@ MonoBehaviour: DistrictName: MissingName DistrictType: 0 DistrictLevel: 0 + Planet: {fileID: 0} --- !u!114 &2620233160227347941 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/Factory.prefab b/Assets/GWConquest/Prefabs/Factory.prefab index 555135b..05abe12 100644 --- a/Assets/GWConquest/Prefabs/Factory.prefab +++ b/Assets/GWConquest/Prefabs/Factory.prefab @@ -31,6 +31,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -81,6 +82,7 @@ MonoBehaviour: DistrictName: MissingName DistrictType: 0 DistrictLevel: 0 + Planet: {fileID: 0} --- !u!114 &3732992427129260454 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/Formation.prefab b/Assets/GWConquest/Prefabs/Formation.prefab index 229034d..dddd4cd 100644 --- a/Assets/GWConquest/Prefabs/Formation.prefab +++ b/Assets/GWConquest/Prefabs/Formation.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.70710677} m_LocalPosition: {x: 0, y: 13, z: -152} m_LocalScale: {x: 15.336881, y: 15.336881, z: 15.336881} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index 339f951..f884d5b 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9127401858082693168} m_Father: {fileID: 4678135251219451999} @@ -57,6 +58,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.25881916, z: 0, w: -0.9659258} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3266501631720423375} m_Father: {fileID: 4678135251219451999} @@ -89,6 +91,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9127401858082693168} m_RootOrder: 2 @@ -259,6 +262,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4678135252239284613} - {fileID: 4678135251355824056} @@ -379,6 +383,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4678135251219451999} m_RootOrder: 1 @@ -425,6 +430,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4678135251219451999} m_RootOrder: 0 @@ -471,6 +477,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4678135251219451999} m_RootOrder: 3 @@ -516,6 +523,7 @@ Transform: m_LocalRotation: {x: 0.35157326, y: 0.2294723, z: -0.0893232, w: 0.90319437} m_LocalPosition: {x: 7.07, y: 37.71, z: -37.04} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7191419555384860655} m_RootOrder: 0 @@ -547,6 +555,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4253974885826492724} - {fileID: 8866216275828915038} @@ -760,6 +769,7 @@ Transform: m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.7071079} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.015, y: 1.015, z: 1.015} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9127401858082693168} m_RootOrder: 1 @@ -854,6 +864,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.0025, y: 0.0025, z: 0.0025} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9127401858082693168} m_RootOrder: 0 diff --git a/Assets/GWConquest/Prefabs/Player.prefab b/Assets/GWConquest/Prefabs/Player.prefab index 16ecb32..42af15d 100644 --- a/Assets/GWConquest/Prefabs/Player.prefab +++ b/Assets/GWConquest/Prefabs/Player.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -170.9198, y: -118.038574, z: -393.51782} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab index aa255f3..c01bd9f 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab @@ -1,19 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &1944167245271204771 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6000337078063549025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6d601ac8ffd0a9740a5a378d6a12d0d3, type: 3} - m_Name: - m_EditorClassIdentifier: - parameter: IsFlank - value: 1 --- !u!1001 &4911594431217981933 PrefabInstance: m_ObjectHideFlags: 0 @@ -84,12 +70,12 @@ PrefabInstance: - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.x - value: 65 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.y - value: 65 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} @@ -159,3 +145,17 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4911594431217981933} m_PrefabAsset: {fileID: 0} +--- !u!114 &1944167245271204771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000337078063549025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d601ac8ffd0a9740a5a378d6a12d0d3, type: 3} + m_Name: + m_EditorClassIdentifier: + parameter: IsFlank + value: 1 diff --git a/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab b/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab new file mode 100644 index 0000000..17c9640 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2060406045218962575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060406045218962574} + - component: {fileID: 2060406045218962672} + - component: {fileID: 2060406045218962673} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2060406045218962574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045218962575} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060406046277770696} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2060406045218962672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045218962575} + m_CullTransparentMesh: 0 +--- !u!114 &2060406045218962673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045218962575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9dd934dc01acfe443a7ff320f825e6fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2060406045324176438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060406045324176441} + - component: {fileID: 2060406045324176443} + - component: {fileID: 2060406045324176440} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2060406045324176441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045324176438} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2060406046277770696} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -22, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2060406045324176443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045324176438} + m_CullTransparentMesh: 0 +--- !u!114 &2060406045324176440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406045324176438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &2060406046277770697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060406046277770696} + - component: {fileID: 2060406046277770699} + m_Layer: 5 + m_Name: CostIconSmall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2060406046277770696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406046277770697} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2060406045218962574} + - {fileID: 2060406045324176441} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2060406046277770699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060406046277770697} + m_CullTransparentMesh: 0 diff --git a/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab.meta b/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab.meta new file mode 100644 index 0000000..59a7f59 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/CostIconSmall.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d9a5624876d2e4f46ba903690c6fc705 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab index bae4a2f..81d373b 100644 --- a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 3 @@ -60,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.8, g: 0.29803923, b: 0.29803923, a: 0.49019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -103,6 +105,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 472968272626717507} - {fileID: 3529282704362558771} @@ -135,7 +138,7 @@ MonoBehaviour: IconPrefab: {fileID: 6000337078063549025, guid: 9ca2c2b7050c3254bb98a6cb77f2a4ba, type: 3} Cols: 3 - IconSize: 65 + IconSize: 90 Icons: [] LeftFrontline: {fileID: 6585815961174857102} RightFrontline: {fileID: 7510832164935520711} @@ -158,7 +161,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &3457511166033474778 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -171,6 +174,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -203,6 +207,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: -1, y: 1, z: 0} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 4 @@ -235,6 +240,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.7254902} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -277,6 +283,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 2 @@ -309,6 +316,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.8, g: 0.29803923, b: 0.29803923, a: 0.49019608} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -351,6 +359,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: -1, y: 1, z: 0} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 0 @@ -383,6 +392,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.475, g: 0.475, b: 0.475, a: 0.9098039} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -425,6 +435,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 6 @@ -457,6 +468,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.34901962} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -503,6 +515,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 1 @@ -535,6 +548,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.475, g: 0.475, b: 0.475, a: 0.9098039} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -577,6 +591,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2893350996044003037} m_RootOrder: 5 @@ -609,6 +624,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.7254902} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/GWConquest/Prefabs/UI/ProductionMenuIcon.prefab b/Assets/GWConquest/Prefabs/UI/ProductionMenuIcon.prefab index 27f0c3c..cf7c5c3 100644 --- a/Assets/GWConquest/Prefabs/UI/ProductionMenuIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/ProductionMenuIcon.prefab @@ -1,5 +1,61 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3006927010356037174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5346828470597951823} + - component: {fileID: 8092067705317722696} + m_Layer: 5 + m_Name: Cost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5346828470597951823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3006927010356037174} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6924224164136034614} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 7} + m_SizeDelta: {x: 400, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8092067705317722696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3006927010356037174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 048208b8918c3c74c821e2e69e3d613d, type: 3} + m_Name: + m_EditorClassIdentifier: + padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + Spacing: {x: 5, y: 0} + Centralized: 1 --- !u!1 &3063478079754774082 GameObject: m_ObjectHideFlags: 0 @@ -36,7 +92,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -6.4} + m_AnchoredPosition: {x: 0, y: 15.64} m_SizeDelta: {x: 0, y: 31.417} m_Pivot: {x: 0, y: 0} --- !u!222 &354279909852957146 @@ -74,7 +130,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -144,8 +200,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -6, y: -6} + m_AnchoredPosition: {x: 0, y: 12.499749} + m_SizeDelta: {x: -6, y: -31.000502} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6924224162615935996 CanvasRenderer: @@ -218,13 +274,14 @@ RectTransform: - {fileID: 6924224162615935970} - {fileID: 8649367179865356553} - {fileID: 1001637495132552133} + - {fileID: 5346828470597951823} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 91, y: 91} + m_SizeDelta: {x: 91, y: 110} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6924224164136034608 CanvasRenderer: @@ -248,6 +305,10 @@ MonoBehaviour: m_EditorClassIdentifier: Icon: {fileID: 6924224162615935971} NameText: {fileID: 5203743795367115769} + Costs: {fileID: 5346828470597951823} + ItemPrefab: {fileID: 4456872408882555056, guid: 6d4b3d6f5c98e624da3746ff322388e5, + type: 3} + DisabledAlpha: 0.15 --- !u!1001 &6924224162369387222 PrefabInstance: m_ObjectHideFlags: 0 @@ -333,7 +394,7 @@ PrefabInstance: - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, type: 3} @@ -378,7 +439,7 @@ PrefabInstance: - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 12.5 objectReference: {fileID: 0} - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, type: 3} diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab new file mode 100644 index 0000000..0b5a515 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab @@ -0,0 +1,255 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6815987389502116021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987389502116018} + - component: {fileID: 6815987389502116017} + - component: {fileID: 6815987389502116016} + - component: {fileID: 6815987389502116019} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987389502116018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6815987390155653560} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: 0, y: 45} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6815987389502116017 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_CullTransparentMesh: 0 +--- !u!114 &6815987389502116016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 43 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!114 &6815987389502116019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987389502116021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &6815987390155653563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987390155653560} + - component: {fileID: 6815987390155653558} + - component: {fileID: 1138806303401438636} + - component: {fileID: 2625037691328288990} + m_Layer: 5 + m_Name: ItemIconLarge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987390155653560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6815987390313110544} + - {fileID: 6815987389502116018} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6815987390155653558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_CullTransparentMesh: 0 +--- !u!114 &1138806303401438636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68d57de996f29404f8d57bdeb85ab942, type: 3} + m_Name: + m_EditorClassIdentifier: + Padding: 0 + Horizontal: 1 + Vertical: 0 +--- !u!114 &2625037691328288990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390155653563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2d51b1b7888cf746a92268bf10b8826, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveTooltipPrefab: {fileID: 5885765285174699514, guid: c693e51d87d6ee54c821bda6af9f17fe, + type: 3} + Icon: {fileID: 6815987390313110545} + Amount: {fileID: 6815987389502116016} + CanBeDragged: 0 + ParentUI: {fileID: 0} +--- !u!1 &6815987390313110547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6815987390313110544} + - component: {fileID: 6815987390313110542} + - component: {fileID: 6815987390313110545} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6815987390313110544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6815987390155653560} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6815987390313110542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + m_CullTransparentMesh: 0 +--- !u!114 &6815987390313110545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815987390313110547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab.meta b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab.meta new file mode 100644 index 0000000..57a3036 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconLarge.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e563d76e61734d44ab61a6a794cf69e4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab new file mode 100644 index 0000000..251ccb9 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab @@ -0,0 +1,249 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7155865475428788491 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6815987389502116016, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_Text + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116016, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116016, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6815987389502116018, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.x + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.y + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653560, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815987390155653563, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_Name + value: ItemIconTiny + objectReference: {fileID: 0} + - target: {fileID: 6815987390313110544, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.x + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 6815987390313110544, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_SizeDelta.y + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 6815987390313110545, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06641392b6ebf5645b031c3f0700a917, type: 3} +--- !u!1 &4456872408329681342 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6815987389502116021, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + m_PrefabInstance: {fileID: 7155865475428788491} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7034655544044694659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4456872408329681342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.916 + offsetAngle: 74.307144 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 1} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] +--- !u!1 &4456872409111049496 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6815987390313110547, guid: 06641392b6ebf5645b031c3f0700a917, + type: 3} + m_PrefabInstance: {fileID: 7155865475428788491} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4260313603585322783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4456872409111049496} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.916 + offsetAngle: 74.307144 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 1} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab.meta b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab.meta new file mode 100644 index 0000000..c6aef8e --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/TransportUI/ItemIconTiny.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6d4b3d6f5c98e624da3746ff322388e5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/Unit.prefab b/Assets/GWConquest/Prefabs/Unit.prefab index f7cd43f..55c5dfd 100644 --- a/Assets/GWConquest/Prefabs/Unit.prefab +++ b/Assets/GWConquest/Prefabs/Unit.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png index 0d24b67..e9a0af7 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png and b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png.meta index 1cf2a74..22f4f9b 100644 --- a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png index 482d206..6339ef8 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png.meta index f040170..4b0f5c2 100644 --- a/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/AntiMaterialRifleSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/AntiTankTruck.png b/Assets/GWConquest/Resources/UnitIcons/AntiTankTruck.png index c533e4c..6bbe033 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/AntiTankTruck.png and b/Assets/GWConquest/Resources/UnitIcons/AntiTankTruck.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png index 8c24040..897bb2d 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png and b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta index 9db8304..bd5de42 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png b/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png index ec749e0..3524d18 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png and b/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png.meta b/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png.meta index 35822cc..9f2d6b9 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ArcaScum.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png index ace57a3..880315a 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png and b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta index 913e6ea..7ebc8df 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png b/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png index fd4e365..832e1d4 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png and b/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png.meta index 22ae71f..794f8ea 100644 --- a/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/BreacherSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png index 45dd223..525bb10 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png and b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png.meta b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png.meta index 030146a..7f7f54f 100644 --- a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png index 4164d96..efba771 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png and b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png.meta index a2f68da..831db2b 100644 --- a/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/CommandoUnit_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png index cc00b60..a92ae56 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png and b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png.meta index cfda791..38ba596 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png index 5dca522..d8a755b 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png.meta index 8785ad7..0658374 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ComsatSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/Conscripts.png b/Assets/GWConquest/Resources/UnitIcons/Conscripts.png index ef27cb4..ebed9e2 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Conscripts.png and b/Assets/GWConquest/Resources/UnitIcons/Conscripts.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Conscripts.png.meta b/Assets/GWConquest/Resources/UnitIcons/Conscripts.png.meta index 15d0e50..0bc90ac 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Conscripts.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Conscripts.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png b/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png index ba0c11c..b363ed6 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png and b/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png.meta index ad2a130..d4f2bb1 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Conscripts_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png b/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png index 4980799..1bb63c7 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png and b/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png.meta index b54a2b2..9470f37 100644 --- a/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/DemolitionSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png b/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png index e284d5b..fb591de 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png and b/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png.meta b/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png.meta index e3bb86e..c5374eb 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ExanClanWarriors.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png b/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png index 9f52da8..f7b8b17 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png and b/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png.meta b/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png.meta index a336be7..e46dfc0 100644 --- a/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/ExanHeadtakers.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png b/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png index bfb4c6f..a5e8802 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png and b/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png.meta index 5dbd4a3..fad0988 100644 --- a/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/GravchuteSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png index c4bfd11..b96eb94 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta index 2e2482a..8b39a98 100644 --- a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png index 88d41dc..1ffe3c9 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png and b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png.meta index c676d6e..cd13e12 100644 --- a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png b/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png index e67c2ac..1c20f3d 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png and b/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png.meta index 1d944cb..1211337 100644 --- a/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/HeavyMountainBrigade.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png b/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png index d349508..fc9797b 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png and b/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png.meta index 7d8be29..7da0d35 100644 --- a/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/HeavyTank.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png b/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png index b541979..6172603 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png.meta index da1e491..8ec334c 100644 --- a/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/LightInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png b/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png index f412d0b..87d0695 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png and b/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png.meta index f5a758d..b317587 100644 --- a/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/LightInfantry_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png b/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png index 4a57f6b..dac3361 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png and b/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png.meta index f615425..e2e2a3e 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MarineSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png index a098a8d..46883f9 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png.meta index 6767c3c..0b2685b 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MarineSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png b/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png index 8d8e6ac..8847e9e 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png and b/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png.meta index 17d438b..7202124 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MedicSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -54,9 +56,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png index 9fb7fd8..0db07f3 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png.meta index b1d34ad..8669c4f 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MedicSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png b/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png index b40460f..8844090 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png and b/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png.meta b/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png.meta index 52ea374..c7295ed 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MethaphorGreenGuard.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png b/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png index 341442a..b55f1c5 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png and b/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png.meta b/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png.meta index f8a4154..a184061 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MethaphorRepublicanGuard.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/Militia.png b/Assets/GWConquest/Resources/UnitIcons/Militia.png index 6628900..d021f10 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Militia.png and b/Assets/GWConquest/Resources/UnitIcons/Militia.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Militia.png.meta b/Assets/GWConquest/Resources/UnitIcons/Militia.png.meta index 0152247..638d4c7 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Militia.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Militia.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/Militia_W.png b/Assets/GWConquest/Resources/UnitIcons/Militia_W.png index 3cc621e..c426971 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Militia_W.png and b/Assets/GWConquest/Resources/UnitIcons/Militia_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Militia_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/Militia_W.png.meta index e71698d..c6074d5 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Militia_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Militia_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png index 79b0428..b7d7fc9 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png and b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png.meta index 1e4f6f8..e773428 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png index 09038f9..ac122f1 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png.meta index edcecf4..a3e231b 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MountaineerSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png new file mode 100644 index 0000000..27c8fc4 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png.meta new file mode 100644 index 0000000..cb59ce4 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad.png.meta @@ -0,0 +1,146 @@ +fileFormatVersion: 2 +guid: ba26213ba8660aa4996da56ab95530bc +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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png index 48a86fe..c008a95 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png.meta index 3398ca0..85bd76f 100644 --- a/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/OfficerSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png index 68612e6..a02bce7 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png and b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png.meta index 55b1a42..6374ca3 100644 --- a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png index fdb5929..195662f 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png and b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png.meta index e3b40b3..4ce47b4 100644 --- a/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/PioneerSquad_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/Rabble.png b/Assets/GWConquest/Resources/UnitIcons/Rabble.png index 53f5174..38e9098 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Rabble.png and b/Assets/GWConquest/Resources/UnitIcons/Rabble.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Rabble.png.meta b/Assets/GWConquest/Resources/UnitIcons/Rabble.png.meta index 585fa97..3470cfb 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Rabble.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Rabble.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png b/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png index e73a19d..08cf56c 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png and b/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png.meta b/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png.meta index 4a5feef..d8bc801 100644 --- a/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/RepublicMarines.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png b/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png index f6e3833..f443d68 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png.meta index 319135f..a0abe7a 100644 --- a/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/RokurantHInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png b/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png index 0b0702a..459e185 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png.meta index 091d6a6..2118fd7 100644 --- a/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/RokurantInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png index 9ec1042..92b83cd 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png and b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta index 80493d0..55c6bb2 100644 --- a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -54,9 +56,12 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png b/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png index e15f3d6..ddccc45 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png and b/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png.meta b/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png.meta index eedf790..1d95512 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SniperTeam.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png b/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png index f203765..157c9a0 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png and b/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png.meta index 07364bb..f4c77b2 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SniperTeam_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png index 24283ec..161c365 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png and b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta index a478613..577788f 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png b/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png index 915a012..0f1c09f 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png and b/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png.meta b/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png.meta index 7ad77d2..0a92662 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SpiceLongclawPack.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png b/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png index ae72ce9..ed91fec 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png and b/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png.meta b/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png.meta index 91181fb..3aff514 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SpiceTunnelerPack.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png index 6a272f3..f468d79 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png.meta index da39fec..15916a5 100644 --- a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png index 01bf07c..022ec6b 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png and b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png.meta b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png.meta index 6e6685b..954bfa0 100644 --- a/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/StandardInfantry_W.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 @@ -111,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -124,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png b/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png index 7919ea5..e13b51c 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png and b/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png.meta b/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png.meta index a5c3619..5b7c4f6 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SuperHeavyTank.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/TankCrew.png b/Assets/GWConquest/Resources/UnitIcons/TankCrew.png index ea570c9..90391fe 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/TankCrew.png and b/Assets/GWConquest/Resources/UnitIcons/TankCrew.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/TankCrew.png.meta b/Assets/GWConquest/Resources/UnitIcons/TankCrew.png.meta index aaa69b5..4832f06 100644 --- a/Assets/GWConquest/Resources/UnitIcons/TankCrew.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/TankCrew.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png b/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png index 0afdd39..2db16ee 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png and b/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png.meta index f17583a..665554b 100644 --- a/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/TankHunterSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png b/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png index 49fd222..890e854 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png and b/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png.meta b/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png.meta index 333b673..41bc174 100644 --- a/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/VesparusFreekorps.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png b/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png index b6ddd69..b9141a7 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png and b/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png.meta b/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png.meta index e2ac192..c6c0469 100644 --- a/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/VesparusMilitia.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png index 31e7425..fd43e94 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png.meta index 53d86f9..bcb21c0 100644 --- a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantry.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png index 85158b9..010d765 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png and b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png.meta b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png.meta index be0d516..1b125e7 100644 --- a/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/VoteineInfantryElite.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png b/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png index 67687d4..9eccc30 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png and b/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png.meta b/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png.meta index d2d7795..226b57c 100644 --- a/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/WythlerAttackSpeeder.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png b/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png index bc0223d..e09df51 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png and b/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png.meta index dc48b9c..4f44c6a 100644 --- a/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/WythlerSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png b/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png index a97c961..dede118 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png and b/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png.meta b/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png.meta index ff16573..9662e67 100644 --- a/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/WythlerTankhunter.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png b/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png index e5104eb..2286336 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png and b/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png.meta index 70d4115..6131023 100644 --- a/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/YarkassyDesertRaiderSquad.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png b/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png index 0151c3d..a89000a 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png and b/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png.meta b/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png.meta index 19e5130..d4d4c65 100644 --- a/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/YarkassyEliteMarksmen.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png b/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png index e8c597c..a536615 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png and b/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png.meta b/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png.meta index fe34d34..c2c7155 100644 --- a/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/YarkassySerpents.png.meta @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,10 +35,10 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -48,15 +50,18 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -107,6 +112,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -120,6 +137,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 88cd691..bfc2645 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -6159,42 +6159,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9374ae8b40a3be448aaad2486d6c544e, type: 3} ---- !u!114 &97882325 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6625931452214719119, guid: 9374ae8b40a3be448aaad2486d6c544e, - type: 3} - m_PrefabInstance: {fileID: 97882324} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &97882326 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6625931451851522487, guid: 9374ae8b40a3be448aaad2486d6c544e, - type: 3} - m_PrefabInstance: {fileID: 97882324} - m_PrefabAsset: {fileID: 0} ---- !u!114 &97882327 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6625931452611917830, guid: 9374ae8b40a3be448aaad2486d6c544e, - type: 3} - m_PrefabInstance: {fileID: 97882324} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!225 &97882328 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 6625931452330189184, guid: 9374ae8b40a3be448aaad2486d6c544e, - type: 3} - m_PrefabInstance: {fileID: 97882324} - m_PrefabAsset: {fileID: 0} --- !u!1001 &98901662 PrefabInstance: m_ObjectHideFlags: 0 @@ -7903,7 +7867,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: -305 + value: -450 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -8578,7 +8542,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 900 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -12044,6 +12008,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 181133503} m_CullTransparentMesh: 0 +--- !u!1 &183152828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183152829} + - component: {fileID: 183152831} + - component: {fileID: 183152830} + m_Layer: 5 + m_Name: Text (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &183152829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183152828} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1420890672} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 15, y: -15} + m_SizeDelta: {x: -30, y: 38.0275} + m_Pivot: {x: 0, y: 1} +--- !u!114 &183152830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183152828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Garrison + +' +--- !u!222 &183152831 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183152828} + m_CullTransparentMesh: 0 --- !u!1 &186435884 GameObject: m_ObjectHideFlags: 0 @@ -13957,7 +14003,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5aa2920b53afa6d429af17c6a662075c, type: 3} m_Name: m_EditorClassIdentifier: - ShowUpgrades: 0 UnitName: {fileID: 1798217996} UnitDescription: {fileID: 1400073093} Content: {fileID: 755462605} @@ -16699,7 +16744,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 900 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -25343,6 +25388,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1001 &423792864 PrefabInstance: m_ObjectHideFlags: 0 @@ -25968,6 +26014,14 @@ MonoBehaviour: StartingPlanets: - {fileID: 905375159} IsAI: 0 + - FactionColor: {r: 0.8, g: 0.47843137, b: 0.41568628, a: 1} + FactionName: Fiefdom of Yar'kassy + ShortName: Yar'kassy + FactionLogo: {fileID: 21300000, guid: 528859f823b3a4f458fcb0fe9ec06f85, type: 3} + StartingPlanets: + - {fileID: 282969352} + - {fileID: 193885456} + IsAI: 1 UnitClasses: [] PlanetData: - Name: Aeculus @@ -33621,6 +33675,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1 &591181017 GameObject: m_ObjectHideFlags: 0 @@ -38757,7 +38812,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: Conscripts + unitName: LightInfantry unitCount: 10 playerId: 1 zone: {fileID: 1976755954} @@ -38876,7 +38931,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: RokurantHInfantry + unitName: HeavyInfantry unitCount: 6 playerId: 1 zone: {fileID: 1976755954} @@ -38925,7 +38980,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: MediumTank + unitName: HeavyTank unitCount: 8 playerId: 1 zone: {fileID: 1976755954} @@ -41753,6 +41808,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 20, y: 0} + Centralized: 0 --- !u!1001 &732721242 PrefabInstance: m_ObjectHideFlags: 0 @@ -43576,6 +43632,7 @@ MonoBehaviour: m_Top: 5 m_Bottom: 5 Spacing: {x: 15, y: 15} + Centralized: 0 --- !u!1001 &755950719 PrefabInstance: m_ObjectHideFlags: 0 @@ -49370,7 +49427,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 900 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -54402,6 +54459,9 @@ GameObject: - component: {fileID: 948716796} - component: {fileID: 948716798} - component: {fileID: 948716797} + - component: {fileID: 948716800} + - component: {fileID: 948716799} + - component: {fileID: 948716801} m_Layer: 0 m_Name: TestUnitsZami m_TagString: Untagged @@ -54421,7 +54481,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: StandardInfantry + unitName: HeavyInfantry unitCount: 8 playerId: 0 zone: {fileID: 24269502} @@ -54591,7 +54651,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: WythlerHAttackSpeeder + unitName: WythlerAttackSpeeder unitCount: 3 playerId: 6 zone: {fileID: 24269502} @@ -54608,7 +54668,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: Rabble + unitName: HeavyInfantry_W unitCount: 5 playerId: 6 zone: {fileID: 24269502} @@ -54625,7 +54685,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} m_Name: m_EditorClassIdentifier: - unitName: Militia_W + unitName: LightInfantry_W unitCount: 3 playerId: 6 zone: {fileID: 24269502} @@ -54730,6 +54790,57 @@ MonoBehaviour: playerId: 6 zone: {fileID: 24269502} assignAsLeader: 0 +--- !u!114 &948716799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948716779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: CommandoUnit + unitCount: 5 + playerId: 0 + zone: {fileID: 24269502} + assignAsLeader: 0 +--- !u!114 &948716800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948716779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: WythlerTankhunter + unitCount: 1 + playerId: 6 + zone: {fileID: 24269502} + assignAsLeader: 0 +--- !u!114 &948716801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948716779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: ComsatSquad_W + unitCount: 2 + playerId: 6 + zone: {fileID: 24269502} + assignAsLeader: 0 --- !u!1 &952141928 GameObject: m_ObjectHideFlags: 0 @@ -55863,6 +55974,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 20, y: 0} + Centralized: 0 --- !u!1001 &967152677 PrefabInstance: m_ObjectHideFlags: 0 @@ -56543,6 +56655,86 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971085363} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &971476563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 971476564} + - component: {fileID: 971476566} + - component: {fileID: 971476565} + m_Layer: 5 + m_Name: Text (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &971476564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971476563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1420890672} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 15, y: 134.1} + m_SizeDelta: {x: -30, y: 38.027527} + m_Pivot: {x: 0, y: 1} +--- !u!114 &971476565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971476563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Storage +--- !u!222 &971476566 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971476563} + m_CullTransparentMesh: 0 --- !u!1 &972746911 GameObject: m_ObjectHideFlags: 0 @@ -59123,7 +59315,7 @@ PrefabInstance: - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_SizeDelta.x - value: -305 + value: -450 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} @@ -59168,7 +59360,7 @@ PrefabInstance: - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_AnchoredPosition.x - value: 152.5 + value: 225 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} @@ -60044,6 +60236,7 @@ MonoBehaviour: m_Top: 5 m_Bottom: 5 Spacing: {x: 15, y: 15} + Centralized: 0 --- !u!1 &1027295671 GameObject: m_ObjectHideFlags: 0 @@ -66349,6 +66542,7 @@ MonoBehaviour: m_Top: 5 m_Bottom: 5 Spacing: {x: 10, y: 10} + Centralized: 0 --- !u!1001 &1131182244 PrefabInstance: m_ObjectHideFlags: 0 @@ -70448,6 +70642,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1 &1205783382 GameObject: m_ObjectHideFlags: 0 @@ -74625,7 +74820,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -74650,7 +74845,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: 600 + value: 900 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -87517,6 +87712,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 12, y: 5} + Centralized: 0 --- !u!1 &1472475329 GameObject: m_ObjectHideFlags: 0 @@ -91902,6 +92098,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1 &1576753261 GameObject: m_ObjectHideFlags: 0 @@ -93272,6 +93469,62 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 25} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1607948199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1607948200} + - component: {fileID: 1607948201} + m_Layer: 5 + m_Name: Storage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1607948200 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607948199} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1420890672} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 15, y: 96.07001} + m_SizeDelta: {x: -34, y: 49.909973} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1607948201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607948199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 048208b8918c3c74c821e2e69e3d613d, type: 3} + m_Name: + m_EditorClassIdentifier: + padding: + m_Left: 5 + m_Right: 5 + m_Top: 0 + m_Bottom: 0 + Spacing: {x: 5, y: 5} + Centralized: 1 --- !u!1001 &1608899188 PrefabInstance: m_ObjectHideFlags: 0 @@ -96126,7 +96379,6 @@ MonoBehaviour: NameText: {fileID: 111343139} DescriptionText: {fileID: 2089647853} ProductionMenu: {fileID: 216757984} - UpgradeMenu: {fileID: 2009225606} QueueMenu: {fileID: 1806309899} GarrisonUI: {fileID: 1590972559} ProductionTransform: {fileID: 1472418056} @@ -111224,7 +111476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6.3808594, y: -6.699951} + m_AnchoredPosition: {x: 6.3808594, y: -6.700012} m_SizeDelta: {x: -32.765747, y: 55} m_Pivot: {x: 0.5, y: 1} --- !u!1 &1857451470 @@ -115212,6 +115464,7 @@ MonoBehaviour: m_Top: 5 m_Bottom: 5 Spacing: {x: 10, y: 10} + Centralized: 0 --- !u!1001 &1940051660 PrefabInstance: m_ObjectHideFlags: 0 @@ -119128,7 +119381,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -119153,7 +119406,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: -305 + value: -450 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -119198,7 +119451,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_AnchoredPosition.x - value: -152.5 + value: -225 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -119770,8 +120023,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1984071956} - {fileID: 1298759242} + - {fileID: 1984071956} - {fileID: 111664030} - {fileID: 77748481770314008} - {fileID: 1003682759} @@ -119816,7 +120069,7 @@ MonoBehaviour: FlankUIPrefabSpace: {fileID: 8197304241899706767, guid: 2e05749fe44bc3a498128c0244f06cb7, type: 3} FlankUIs: [] - FlankUIOffset: 230 + FlankUIOffset: 320 LandscapeImage: {fileID: 108234953} LeftSwitchArrow: {fileID: 1997081172} RightSwitchArrow: {fileID: 168624194} @@ -120798,40 +121051,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2009225603} m_PrefabAsset: {fileID: 0} ---- !u!1 &2009225605 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, - type: 3} - m_PrefabInstance: {fileID: 2009225603} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2009225606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009225605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5aa2920b53afa6d429af17c6a662075c, type: 3} - m_Name: - m_EditorClassIdentifier: - ShowUpgrades: 1 - UnitName: {fileID: 97882327} - UnitDescription: {fileID: 97882325} - Content: {fileID: 1022689915} - IconPrefab: {fileID: 6924224164136034613, guid: 2f11b55f5ed06ea47ad34fa5be334264, - type: 3} - ScrollRect: {fileID: 1906939933} - IconHeight: 68 - IconOffset: 5 - InfoGroup: {fileID: 97882328} - AlphaLerpSmooth: 12 - Costs: {fileID: 97882326} - CostIconPrefab: {fileID: 2060406046277770697, guid: be3e86f45d1d78f43af8665f425f7b85, - type: 3} - CostIconWidth: 65 - CreditSprite: {fileID: 21300000, guid: b7056bf0cc9b143499b92ad49c579d92, type: 3} --- !u!1 &2010152926 GameObject: m_ObjectHideFlags: 0 @@ -122247,6 +122466,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1001 &2046872095 PrefabInstance: m_ObjectHideFlags: 0 @@ -123534,6 +123754,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 Spacing: {x: 2, y: 0} + Centralized: 0 --- !u!1001 &2078070485 PrefabInstance: m_ObjectHideFlags: 0 @@ -127066,12 +127287,12 @@ PrefabInstance: - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_SizeDelta.x - value: -305 + value: -449.99997 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_SizeDelta.y - value: -196.97455 + value: -196.9745 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} @@ -127111,12 +127332,12 @@ PrefabInstance: - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_AnchoredPosition.x - value: -152.5 + value: -225.00002 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} propertyPath: m_AnchoredPosition.y - value: -48.512733 + value: -48.512756 objectReference: {fileID: 0} - target: {fileID: 1827644952844820914, guid: f69b4b94559d7a14d99e0d870647c1f9, type: 3} @@ -127384,8 +127605,25 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1069889124, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: 0.000015258789 + objectReference: {fileID: 0} + - target: {fileID: 1277175058, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} + propertyPath: m_SizeDelta.y + value: -192.0021 + objectReference: {fileID: 0} + - target: {fileID: 1277175058, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 46.001038 objectReference: {fileID: 0} + - target: {fileID: 1590972559, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} + propertyPath: ItemPrefab + value: + objectReference: {fileID: 6815987390155653563, guid: e563d76e61734d44ab61a6a794cf69e4, + type: 3} + - target: {fileID: 1590972559, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} + propertyPath: ItemsTransform + value: + objectReference: {fileID: 1607948200} - target: {fileID: 2443912949472084106, guid: f8bffe0306e53cb4b958afe65a7c7b2c, type: 3} propertyPath: m_Name @@ -127528,6 +127766,11 @@ PrefabInstance: propertyPath: m_Name value: GleamEffect objectReference: {fileID: 0} + - target: {fileID: 6109372026020611718, guid: 52ceb6607c69a284bbaf944247e5e802, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -103.3999 + objectReference: {fileID: 0} - target: {fileID: 8692434406677502926, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/GWConquest/Scripts/BoltList.cs b/Assets/GWConquest/Scripts/BoltList.cs index 59aced6..bffa8c8 100644 --- a/Assets/GWConquest/Scripts/BoltList.cs +++ b/Assets/GWConquest/Scripts/BoltList.cs @@ -215,4 +215,21 @@ namespace GWConquest { public ZoneList(IState _state, string _propertyName) : base(_state, _propertyName) {} } + + public class StringListToken : BoltListToken { + public override string ReadEntry(UdpPacket packet) + { + return packet.ReadString(); + } + + public override void WriteEntry(UdpPacket packet, string entry) + { + packet.WriteString(entry); + } + } + + public class StringList : BoltList + { + public StringList(IState _state, string _propertyName) : base(_state, _propertyName) {} + } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index 0520bc3..0ad6801 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -20,6 +20,7 @@ namespace GWConquest public int DistrictLevel; public EntityList ConnectionList; + public StringList UpgradeList; private Zone _zone; public Zone Zone { @@ -78,6 +79,7 @@ namespace GWConquest public override void Attached() { ConnectionList = new EntityList(State, "ConnectedDistricts"); + UpgradeList = new StringList(State, "Upgrades"); if(entity.IsOwner) { @@ -286,6 +288,13 @@ namespace GWConquest return DistrictUpgrade.GetAllUpgrades().Where(u => u.AllowedDistrictTypes.Contains(DistrictType)); } + public bool CanBuild(IBuildable buildable) + { + var cost = buildable.BuildCost; + return ControllingPlayer.Credits >= cost.CreditCost && Inventory.HasItem("Recruits", cost.RecruitCost) + && Inventory.HasItem("Supplies", cost.AmmoCost) && Inventory.HasItem("Fuel", cost.FuelCost); + } + } public enum DistrictType diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs index f9c0a0e..34b5e20 100644 --- a/Assets/GWConquest/Scripts/DistrictFactory.cs +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -65,9 +65,16 @@ namespace GWConquest } } - public UnitClass GetProductionQueueEntry(int i) + public IBuildable GetProductionQueueEntry(int i) { - return UnitClass.FromName(State.ProductionQueue[i].UnitClass); + if(State.ProductionQueue[i].IsUpgrade) + { + return DistrictUpgrade.FromName(State.ProductionQueue[i].UnitClass); + } + else { + return UnitClass.FromName(State.ProductionQueue[i].UnitClass); + } + } public float GetProductionTime(int i) @@ -113,7 +120,7 @@ namespace GWConquest } - public void AddProductionQueueEntry(string uc, Player player) + public void AddProductionQueueEntry(string uc, Player player, bool isUpgrade) { int length = ProductionQueueLength; if(length < MaxQueueLength) @@ -122,6 +129,7 @@ namespace GWConquest State.ProductionQueue[length].UnitClass = uc; State.ProductionQueue[length].TimeProduced = 0f; State.ProductionQueue[length].Player = player.entity; + State.ProductionQueue[length].IsUpgrade = isUpgrade; } } @@ -132,17 +140,24 @@ namespace GWConquest if(IsProducing) { State.ProductionQueue[0].TimeProduced += BoltNetwork.FrameDeltaTime; - UnitClass uc = GetProductionQueueEntry(0); - if (DebugUI.FreeBuild || GetProductionTime(0) >= uc.BuildTime) + IBuildable buildable = GetProductionQueueEntry(0); + if (DebugUI.FreeBuild || GetProductionTime(0) >= buildable.BuildTime) { - Zone zone = GetComponent(); - if(zone != null) + if(buildable is UnitClass) { - Unit.SpawnUnit(zone, uc, State.ProductionQueue[0].Player.GetComponent()); + Zone zone = GetComponent(); + if(zone != null) + { + Unit.SpawnUnit(zone, buildable as UnitClass, State.ProductionQueue[0].Player.GetComponent()); + } + else + { + BoltLog.Error("No corresponding zone for factory {0}", gameObject.name); + } } - else + else if(buildable is DistrictUpgrade) { - BoltLog.Error("No corresponding zone for factory {0}", gameObject.name); + District.UpgradeList.Add((buildable as DistrictUpgrade).ShortName); } RemoveProductionQueueEntry(0); } diff --git a/Assets/GWConquest/Scripts/GlobalCallbacks.cs b/Assets/GWConquest/Scripts/GlobalCallbacks.cs index 5588ead..8798980 100644 --- a/Assets/GWConquest/Scripts/GlobalCallbacks.cs +++ b/Assets/GWConquest/Scripts/GlobalCallbacks.cs @@ -15,6 +15,7 @@ namespace GWConquest BoltNetwork.RegisterTokenClass(); BoltNetwork.RegisterTokenClass(); BoltNetwork.RegisterTokenClass(); + BoltNetwork.RegisterTokenClass(); } public override void SceneLoadLocalDone(string scene, IProtocolToken token) diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs index 31cc285..032896e 100644 --- a/Assets/GWConquest/Scripts/ServerCallbacks.cs +++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs @@ -107,7 +107,7 @@ namespace GWConquest public override void OnEvent(AddProductionEvent evnt) { DistrictFactory factory = evnt.Factory.GetComponent(); - factory.AddProductionQueueEntry(evnt.UnitClass, evnt.Player.GetComponent()); + factory.AddProductionQueueEntry(evnt.UnitClass, evnt.Player.GetComponent(), evnt.IsUpgrade); } public override void OnEvent(MoveUnitToFlankEvent evnt) diff --git a/Assets/GWConquest/Scripts/UI/DistrictUI.cs b/Assets/GWConquest/Scripts/UI/DistrictUI.cs index e9db485..1e14761 100644 --- a/Assets/GWConquest/Scripts/UI/DistrictUI.cs +++ b/Assets/GWConquest/Scripts/UI/DistrictUI.cs @@ -11,7 +11,6 @@ namespace GWConquest public Text DescriptionText; public ProductionMenu ProductionMenu; - public ProductionMenu UpgradeMenu; public QueueMenu QueueMenu; public GarrisonUI GarrisonUI; @@ -31,20 +30,16 @@ namespace GWConquest if(district.GetComponent() != null) { ProductionMenu.gameObject.SetActive(true); - UpgradeMenu.gameObject.SetActive(true); QueueMenu.gameObject.SetActive(true); DistrictFactory factory = district.GetComponent(); ProductionMenu.Clear(); ProductionMenu.Init(factory); - UpgradeMenu.Clear(); - UpgradeMenu.Init(factory); QueueMenu.Init(factory); } else { ProductionMenu.gameObject.SetActive(false); - UpgradeMenu.gameObject.SetActive(false); QueueMenu.gameObject.SetActive(false); } diff --git a/Assets/GWConquest/Scripts/UI/FlowLayout.cs b/Assets/GWConquest/Scripts/UI/FlowLayout.cs index b3c6b93..facdbc5 100644 --- a/Assets/GWConquest/Scripts/UI/FlowLayout.cs +++ b/Assets/GWConquest/Scripts/UI/FlowLayout.cs @@ -11,6 +11,8 @@ namespace GWConquest { public Vector2 Spacing; + public bool Centralized = false; + private RectTransform _rectTransform; private RectTransform rectTransform { @@ -33,6 +35,24 @@ namespace GWConquest { float currentX = padding.left; float currentY = padding.top; + if(Centralized) + { + float childSize = padding.left; + for(int i = 0; i < rectTransform.childCount; i++) + { + var child = rectTransform.GetChild(i) as RectTransform; + var newSize = childSize + child.sizeDelta.x + Spacing.x; + if(newSize > size.x - padding.right) + { + break; + } + else { + childSize = newSize; + } + } + currentX = (size.x - childSize) * 0.5f; + } + float currentLineHeight = 0f; for(int i = 0; i < rectTransform.childCount; i++) diff --git a/Assets/GWConquest/Scripts/UI/GarrisonUI.cs b/Assets/GWConquest/Scripts/UI/GarrisonUI.cs index 6c1d089..13897c9 100644 --- a/Assets/GWConquest/Scripts/UI/GarrisonUI.cs +++ b/Assets/GWConquest/Scripts/UI/GarrisonUI.cs @@ -13,9 +13,16 @@ namespace GWConquest public GameObject ElementPrefab; + public RectTransform ItemsTransform; + public GameObject ItemPrefab; + [System.NonSerialized] public List SubElementList = new List(); + [System.NonSerialized] + public List ItemIconList = new List(); + + private Zone CurrentZone; public void Init(Zone z) @@ -29,12 +36,15 @@ namespace GWConquest public void Update() { GWLayout.UpdateLayout(ContentTransform); + GWLayout.UpdateLayout(ItemsTransform); } public void RebuildPanel() { Util.DestroyAllChildren(ContentTransform); SubElementList.Clear(); + Util.DestroyAllChildren(ItemsTransform); + ItemIconList.Clear(); } public void FixedUpdate() @@ -68,6 +78,9 @@ namespace GWConquest return elementComp; }); + + var items = CurrentZone.GetComponent().Inventory; + GWLayout.UpdateGameObjects(ItemIconList, items.ToList(), ItemPrefab, ItemsTransform, ItemStack.ItemsEqual); } private TransportUIElement AddElement(RectTransform parent) { diff --git a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs index 37f1e72..e0f45c9 100644 --- a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs +++ b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs @@ -8,8 +8,6 @@ namespace GWConquest { public class ProductionMenu : MonoBehaviour { - public bool ShowUpgrades; - public Text UnitName; public Text UnitDescription; public RectTransform Content; @@ -29,7 +27,8 @@ namespace GWConquest private float AlphaLerpTarget = 0; - private DistrictFactory factory; + [System.NonSerialized] + public DistrictFactory factory; private List buildables; private List iconList = new List(); @@ -38,13 +37,13 @@ namespace GWConquest public void Init(DistrictFactory _factory) { factory = _factory; - if(ShowUpgrades) - { - buildables = factory.GetComponent().GetAvailableUpgrades().Cast().ToList(); - } - else { - buildables = factory.GetAvailableUnitClasses().Cast().ToList(); - } + var upgrades = factory.GetComponent().GetAvailableUpgrades().Cast().ToList(); + + var unitclasses = factory.GetAvailableUnitClasses().Cast().ToList(); + + buildables = new List(); + buildables.AddRange(upgrades); + buildables.AddRange(unitclasses); GWLayout.UpdateGameObjects(iconList, buildables, IconPrefab, Content); @@ -129,19 +128,23 @@ namespace GWConquest { if(factory.ProductionQueueLength < factory.MaxQueueLength) { - - AddProductionEvent ev = AddProductionEvent.Create(GlobalTargets.OnlyServer); - ev.Factory = factory.entity; - if(buildable is UnitClass) - { - ev.UnitClass = (buildable as UnitClass).ShortName; - } - else if(buildable is DistrictUpgrade) + if(DebugUI.FreeBuild || buildable.BuildCost == null || factory.District.CanBuild(buildable)) { - + AddProductionEvent ev = AddProductionEvent.Create(GlobalTargets.OnlyServer); + ev.Factory = factory.entity; + if(buildable is UnitClass) + { + ev.UnitClass = (buildable as UnitClass).ShortName; + ev.IsUpgrade = false; + } + else if(buildable is DistrictUpgrade) + { + ev.UnitClass = (buildable as DistrictUpgrade).ShortName; + ev.IsUpgrade = true; + } + ev.Player = Player.CurrentPlayer.entity; + ev.Send(); } - ev.Player = Player.CurrentPlayer.entity; - ev.Send(); } } diff --git a/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs b/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs index 6a27bfd..ab2c2de 100644 --- a/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs +++ b/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs @@ -8,6 +8,10 @@ namespace GWConquest { public Image Icon; public Text NameText; + public RectTransform Costs; + public GameObject ItemPrefab; + + public float DisabledAlpha; private IBuildable Buildable; private ProductionMenu Menu; @@ -18,6 +22,30 @@ namespace GWConquest Buildable = unitClass; Icon.sprite = unitClass.Sprite; NameText.text = unitClass.FullName; + + Util.DestroyAllChildren(Costs); + + if(unitClass.BuildCost != null) + { + SpawnCostIcon("Credits", unitClass.BuildCost.CreditCost); + SpawnCostIcon("Recruits", unitClass.BuildCost.RecruitCost); + SpawnCostIcon("Supplies", unitClass.BuildCost.AmmoCost); + SpawnCostIcon("Fuel", unitClass.BuildCost.FuelCost); + + GWLayout.UpdateLayout(Costs); + } + } + + private void SpawnCostIcon(string item, int amount) + { + if(amount > 0) + { + var go = Instantiate(ItemPrefab); + go.transform.SetParent(Costs); + + var ui = go.GetComponent(); + ui.UpdateDisplay(ItemStack.FromItem(item, amount)); + } } public IBuildable GetObject() @@ -42,6 +70,21 @@ namespace GWConquest Menu.ScrollRect.OnScroll(ev as PointerEventData); } } + + void Update() + { + var district = Menu.factory.District; + if(Buildable.BuildCost != null) + { + if(DebugUI.FreeBuild || district.CanBuild(Buildable)) + { + Icon.color = Util.UpdateColorAlpha(Icon.color, 1f); + } + else { + Icon.color = Util.UpdateColorAlpha(Icon.color, DisabledAlpha); + } + } + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs index 65aaf6d..85d3db7 100644 --- a/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs +++ b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs @@ -12,7 +12,7 @@ namespace GWConquest private QueueMenu menu; private int queueIndex = -1; - private UnitClass unitClass = null; + private IBuildable unitClass = null; private float percentage = -1; public void Init(QueueMenu _menu) @@ -20,7 +20,7 @@ namespace GWConquest menu = _menu; } - public void UpdateIcon(int i, UnitClass uc, float p) + public void UpdateIcon(int i, IBuildable uc, float p) { if(i != queueIndex) { diff --git a/Assets/GWConquest/Scripts/Util.cs b/Assets/GWConquest/Scripts/Util.cs index 4f5e21e..612f47d 100644 --- a/Assets/GWConquest/Scripts/Util.cs +++ b/Assets/GWConquest/Scripts/Util.cs @@ -109,6 +109,11 @@ namespace GWConquest return new Color(newColor.r, newColor.g, newColor.b, color.a); } + public static Color UpdateColorAlpha(this Color color, float newAlpha) + { + return new Color(color.r, color.g, color.b, newAlpha); + } + public static Vector3 SmoothDampEulerAngles(Vector3 current, Vector3 target, ref Vector3 velocity, float smoothTime) { float x = Mathf.SmoothDampAngle(current.x, target.x, ref velocity.x, smoothTime); diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index d7ba0d6..4216889 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb index e0484f2..e6274c2 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json index 373a7dd..21bc5c4 100644 --- a/Assets/Photon/PhotonBolt/project.json +++ b/Assets/Photon/PhotonBolt/project.json @@ -1474,6 +1474,19 @@ "AssetSettings": { "$type": "Photon.Bolt.Compiler.PropertyEventSettings, bolt.compiler" } + }, + { + "Name": "IsUpgrade", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeBool, bolt.compiler" + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyEventSettings, bolt.compiler" + } } ], "EntitySenders": 3, @@ -1544,6 +1557,23 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "IsUpgrade", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeBool, bolt.compiler" + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "Name": "QueueEntry", @@ -2447,6 +2477,23 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "Upgrades", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Photon.Bolt.Compiler.PropertyTypeProtocolToken, bolt.compiler" + }, + "AssetSettings": { + "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "PacketMaxBits": 512,