From 9a988f40c1385a6e5d25590b0478c555762e6855 Mon Sep 17 00:00:00 2001 From: Sun Date: Tue, 4 May 2021 01:31:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EB=A7=B5=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/Dissolve/Hexart_DECG.mat | 2 +- Assets/Resources/mapinfo.txt | 98 +++++++++---------- Assets/Scripts/Manager/Enum.cs | 3 +- Assets/Scripts/Tile/Tile.cs | 6 +- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/UnityConnectSettings.asset | 1 + 6 files changed, 58 insertions(+), 56 deletions(-) diff --git a/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat b/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat index 1a3d565..b272feb 100644 --- a/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat +++ b/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat @@ -81,7 +81,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Progress: -0.0054912344 + - _Progress: -0.0074286163 - _RangeIn: 0.034 - _RangeOut: 0.001 - _SmoothnessTextureChannel: 0 diff --git a/Assets/Resources/mapinfo.txt b/Assets/Resources/mapinfo.txt index 5d7abff..cba23ef 100644 --- a/Assets/Resources/mapinfo.txt +++ b/Assets/Resources/mapinfo.txt @@ -1,50 +1,50 @@ -NNNNMMM1110000000000000000000000000200222222222222 -NNNMM111B000000000003300300000000002222022222C2200 -NNNMM111110000003333333333300000000002222220200200 -MMMMM1111100000033I333I330000000002222000000022222 -MMMMM111111000033333300033000002202200000000002000 -MMMM1111110003333303000333000000003020000020000220 -1MMM11B1100000330000300033000333000300220020000022 -11111111100000000003000033333303000322220002200222 -1111111000000A000000000000003D330000022C2002222200 -11111000000000033330000000000300000002222222202000 -00101000000033333033000300000300000000002222222200 -00000000003000000003033330003003333300000030000000 -00000000030003000003330000003330000033000030000000 -0011000003003300033D300000003300000003000300000000 -02222200033030333300300003330000033333311111330000 -2222220033330000000000000333000033333013M111330000 -2222C22003300000000000000000000033300331MNNN110MMM -2222220000000000000100000000A00033300001NNNN1MMMMM -0002200000000000001111101111000033333101MNNNMMMMMM -0000000030000000111112211110000000033131MMMMMMMMM0 -0000010033300A001111222221110010000333331111111100 -000001003300000112222MM222111010000003333001111111 -00000011333300000122MMMMM2221101000333303000100010 -0000111300000000122MMMMMMM222211000303033000000000 -0000111100003300112MMMNNMMMM2211100130033000000000 -0000110130033000122MMNNNNMM22111000030330000000000 -00000011130330000122MNNNMMMM221B100000030000000000 -000001100000000111222MMMMMM22211100000000000000000 -000000113003000111111222222C2211100000000033000000 -00110000033000011111112222221100000011003303000000 -00101000300000000110011111B11110000010330030300000 -11111000300030000100111111111000000311110003300000 -01011100303333000000000000110000033011011300030000 -011B100033000300000000A000000000300101B10300330000 -00111000003300000000000000000000030011113033330000 -00010000000000033333000000001000033300030330300000 +NNNNMMM1110000000000000000000E00000222222IIIIII222 +NNNMM111000000000000K300300000000002222C2IIII02J00 +NNNMM111G10000003333333333K0000E00000022222EFEE200 +MMMMM111110E0000333333K3300A00000022220000EEE22222 +MMMMM11G111000033L3K3000330000022022000FF000EE2000 +MMMM11111100033333030003K30000000030200F0020000J20 +1MMM11B11000003300003000330003330003002JE0200000J2 +11111G11100000000E030E0033333L33000322JJ000220022I +1111H11000000E0000000000000030330000022JJ002222200 +1G1110000000000333300A00000003000E00022JJ22C2C2000 +00100000000033333033000300E00300000000002222222I00 +0000000000300000E003033330003003333300000030000000 +0000000E030003000003L30000003330000033000030000000 +0011000003003300033030000000330E00000K000300000000 +02122200033030333300300E03330000033333311111330000 +222222003L33000000000000033300003D333DH3M1G1330000 +22J2CI200330000000000E00000000E033300331MNNNG10MMM +222222000000F000001111H111G000003K300001NNNN1MMMMM +000J200000E00000001111111111100033333101MNNNMMMMMM +000000F030000000111G12211HH1100000033131MMMMMMMMM0 +0000010033300E00G11122222HHH111000033333G111111G00 +000001000300000112222MM222HH111000000L33300G11111G +00E000G13K3300000122MMMMMI2211110A0333303000100010 +000011130000000012IMMMMMMM222211000303033000000000 +00001G1100003300112MMMNNMMMM221G10013003300000F000 +0F00H1B130033000122MMNNNNMM22111000030300000000000 +0000001113033000A122MNNNMMMM221110000003000A000000 +000001G0000000011122IMMMMMM22211G0E00000E000001000 +0000001130030EE11G111222222CI211100000000033000000 +001100000330EEE11111112222221100000011003303000000 +001B10F030000EEEE110011G11B111100E0011330030300000 +11111F0030003EEEE10A111111G1100F000311EG0003300000 +01001100303333EEEE0000000011000003301GME1300030000 +0110G000330003EEEE000000000000E0300111H10300330000 +001G10000033000000000000000000E0030011113033330000 +000100E000000003333300E000001000033300030330300000 00000000033330330000330000111000000000033333000000 -00000000M30000300000030001101133000000000030000000 -00000000000M00033000000100111100333333333300000000 -0000000MMM0031100001000110010003300000000000000000 -0000003MNNNNMM333110003310000000003303300000000000 -0000000MNNNNMM103001000033000000330000300000000000 -033003000000MMM00003333003333303300330030000000000 -300033MMMMM0M3333300330030030333333033030000000000 -33000000MMM33333333333330300333003333D33000A000000 -3333300003MMM00000033D3303030033303033300000000000 -30333333033303000000003330330333303330000000000000 -3333D333333330000000000030000030030000000000000000 -00333333300300003333333300000000000000000000000000 -0000000000003333333333000000A00000000000000000000A \ No newline at end of file +E0000000M300EA3000000300011B1133000000000030000000 +00000000000M000330E0000100111100333333333300EEEE00 +E000000MMM00311000010001100100033000000000EEEEEE00 +0000003MNNNNMM3331100033100000E00033033000EFFFFEEE +0000EEEMNNNNMM10300100003300000033000030EEFFFFEEE0 +0330E3EEEEEEMMM00003333003333303300330030EFFFEEEEE +300E33MMMMMEM33L330033003333333333333303EFFEEF0000 +330EEEEEMMM3333333333D33033K303333L333330EFEFF0000 +33333EEEE3MMM000000L33K30333003D33333K300000000000 +3D333333E333E3000E00003330330333333330000000000000 +3333D333333330000000000030000030030000000000A00000 +0033333330030F0033333333000F0000000000000000000000 +000000000E0033333333330000000000000000000000000000 \ No newline at end of file diff --git a/Assets/Scripts/Manager/Enum.cs b/Assets/Scripts/Manager/Enum.cs index 0d196ec..48a8ebb 100644 --- a/Assets/Scripts/Manager/Enum.cs +++ b/Assets/Scripts/Manager/Enum.cs @@ -35,7 +35,8 @@ public enum TILE STONE_DECO2 = 'L', SEA_01 = 'M', SEA_02 = 'N', - SEA_03 = 'O' + SEA_03 = 'O', + MARS = -1 } /* diff --git a/Assets/Scripts/Tile/Tile.cs b/Assets/Scripts/Tile/Tile.cs index f73506c..9e3e89f 100644 --- a/Assets/Scripts/Tile/Tile.cs +++ b/Assets/Scripts/Tile/Tile.cs @@ -27,9 +27,9 @@ void Start() { tile = this.GetComponent(); - if (this.tileuniquecode >= (int)TILE.GRASS_TREE) { this.tileSpriteRend.sprite = tiledecoSprite[this.tileuniquecode - (int)TILE.GRASS_TREE]; } - else if (this._code >= (int)TILE.GRASS_START && this._code < (int)TILE.GRASS_TREE) { this.tileSpriteRend.sprite = tileSprite[this._code - (int)TILE.GRASS_START]; } - else if (this._code < (int)TILE.CAN_MOVE) { this.tileSpriteRend.sprite = tileSprite[this._code]; } + if (this.tileuniquecode >= (int)TILE.GRASS_START && this.tileuniquecode < (int)TILE.GRASS_TREE) { this.tileSpriteRend.sprite = tileSprite[this.tileuniquecode - (int)TILE.GRASS_START]; } + else if (this.tileuniquecode >= (int)TILE.GRASS_TREE) { this.tileSpriteRend.sprite = tiledecoSprite[this.tileuniquecode - (int)TILE.GRASS_TREE]; } + else if (this.tileuniquecode < (int)TILE.CAN_MOVE) { this.tileSpriteRend.sprite = tileSprite[this._code]; } _name = "독도는"; _desc = "우리땅"; diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 39ae3a3..fb7dbd0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.2f1 -m_EditorVersionWithRevision: 2020.2.2f1 (068178b99f32) +m_EditorVersion: 2020.3.6f1 +m_EditorVersionWithRevision: 2020.3.6f1 (338bb68529b2) diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146..6125b30 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -9,6 +9,7 @@ UnityConnectSettings: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com From 0db7bc0d1dc17dd11b8361e2d683c4b35aa41947 Mon Sep 17 00:00:00 2001 From: Sun Date: Thu, 6 May 2021 01:00:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=9D=BC=EA=BE=BC?= =?UTF-8?q?=EC=9D=B4=20=EA=B1=B4=EC=84=A4=EC=A4=91=EC=9D=BC=EB=95=8C=20?= =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=ED=96=89=EB=8F=99=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=9C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20UI=20=EC=95=88=EB=9C=A8=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/Dissolve/Hexart_DECG.mat | 2 +- Assets/Scenes/InGame.unity | 12 ++- Assets/Scripts/Manager/GameMng.cs | 26 ++++- Assets/Scripts/Manager/UnitMng.cs | 1 + Assets/Scripts/Unit/Unit.cs | 10 +- .../hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png | Bin 0 -> 4158 bytes .../PNG/Tiles/Sea/ui_sea_00.png.meta | 96 ++++++++++++++++++ .../hexagon-pack/PNG/Tiles/Sea/ui_sea_01.png | Bin 0 -> 5442 bytes .../PNG/Tiles/Sea/ui_sea_01.png.meta | 96 ++++++++++++++++++ .../hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png | Bin 0 -> 5235 bytes .../PNG/Tiles/Sea/ui_sea_02.png.meta | 96 ++++++++++++++++++ 11 files changed, 330 insertions(+), 9 deletions(-) create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png.meta create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_01.png create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_01.png.meta create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png create mode 100644 Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png.meta diff --git a/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat b/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat index b272feb..bc7224e 100644 --- a/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat +++ b/Assets/Lomenu UI/Materials/Dissolve/Hexart_DECG.mat @@ -81,7 +81,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Progress: -0.0074286163 + - _Progress: -0.0058515226 - _RangeIn: 0.034 - _RangeOut: 0.001 - _SmoothnessTextureChannel: 0 diff --git a/Assets/Scenes/InGame.unity b/Assets/Scenes/InGame.unity index 03ae2d9..d112606 100644 --- a/Assets/Scenes/InGame.unity +++ b/Assets/Scenes/InGame.unity @@ -7961,7 +7961,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 6bee12329789d06498d9efbf43125a38, type: 3} - {fileID: 21300000, guid: f532883756b6f1a47982416a36437fc2, type: 3} - {fileID: 21300000, guid: f89d12bd18db68f46ac146795493daad, type: 3} - - {fileID: 21300000, guid: 2a9a942a3dc771241a81022e8bfc1f7b, type: 3} + - {fileID: 21300000, guid: b93c9fbba8889e5419c26ddb2a6316eb, type: 3} - {fileID: 21300000, guid: b422a68ac9d967f4ba3d06d7707e3892, type: 3} - {fileID: 21300000, guid: 48853b64a25bd0b4ca3bb19260c643af, type: 3} - {fileID: 21300000, guid: b08e570699f1c8a4f9cc388204aef3bc, type: 3} @@ -7982,6 +7982,16 @@ MonoBehaviour: - {fileID: 21300014, guid: e48ddf4fb7304ce4ab48711eb6617a57, type: 3} - {fileID: 21300102, guid: e48ddf4fb7304ce4ab48711eb6617a57, type: 3} - {fileID: 21300104, guid: e48ddf4fb7304ce4ab48711eb6617a57, type: 3} + - {fileID: 21300000, guid: ce44b67118439c145aa68bbeecf92d7a, type: 3} + - {fileID: 21300000, guid: 589ad35d2372fc24a8cb804d15c6f87f, type: 3} + - {fileID: 21300000, guid: 7df0c622fc0fc3a4f8b44340018c9ad0, type: 3} + - {fileID: 21300000, guid: 51564a1d82ed53b4da8c6568136a951c, type: 3} + - {fileID: 21300000, guid: e3aa99260b442b14087a2eeb08ac0306, type: 3} + - {fileID: 21300000, guid: a92c6ecca99317b43a9c42907227c12e, type: 3} + - {fileID: 21300000, guid: f22b932707676a54faf6433035a2ec93, type: 3} + - {fileID: 21300000, guid: b284e4999e5db844283cbdcfba1aad8a, type: 3} + - {fileID: 21300000, guid: 31eb0f45182afb94bb64af2722a58cbf, type: 3} + - {fileID: 21300000, guid: 3c9fe331726228e4fb20fc69d80ef001, type: 3} mainBarObj: {fileID: 1183078789144197330} loseUI: {fileID: 2110199068} winUI: {fileID: 1514986757} diff --git a/Assets/Scripts/Manager/GameMng.cs b/Assets/Scripts/Manager/GameMng.cs index c1857d9..b3e188a 100644 --- a/Assets/Scripts/Manager/GameMng.cs +++ b/Assets/Scripts/Manager/GameMng.cs @@ -15,7 +15,7 @@ public class GameMng : MonoBehaviour */ [HideInInspector] public int _gold = 0; - [HideInInspector] + [SerializeField] public int _food = 0; [HideInInspector] public int _nowMem = 0; @@ -219,7 +219,7 @@ void Start() public void init() { _gold = 100; - _food = 100; + _food = 0; _nowMem = 0; _maxMem = 0; @@ -438,7 +438,7 @@ public void turnManage(int uniqueNumber) } else { - countHungry = 0; + countHungry = -1; //debuffImg.enabled = false; debuffImg.color = Color.clear; debufFoodIcon.SetActive(false); @@ -1335,9 +1335,9 @@ public Sprite getObjSprite(int code) case (int)TILE.SEA_01: return objSprite[9]; case (int)TILE.SEA_02: - return objSprite[9]; + return objSprite[38]; case (int)TILE.SEA_03: - return objSprite[9]; + return objSprite[39]; case (int)UNIT.FOREST_WORKER: return objSprite[12]; case (int)UNIT.FOREST_SOLDIER_0: @@ -1374,6 +1374,22 @@ public Sprite getObjSprite(int code) return objSprite[28]; case (int)UNIT.DESERT_WITCH_1: return objSprite[29]; + case (int)TILE.GRASS_TREE: + return objSprite[30]; + case (int)TILE.GRASS_STONE: + return objSprite[31]; + case (int)TILE.SAND_TREE: + return objSprite[32]; + case (int)TILE.SAND_STONE: + return objSprite[33]; + case (int)TILE.DIRT_TREE: + return objSprite[34]; + case (int)TILE.DIRT_STONE: + return objSprite[35]; + case (int)TILE.STONE_DECO1: + return objSprite[36]; + case (int)TILE.STONE_DECO2: + return objSprite[37]; case (int)BUILT.MINE: setMainInterface(true, false); return objSprite[0]; diff --git a/Assets/Scripts/Manager/UnitMng.cs b/Assets/Scripts/Manager/UnitMng.cs index 281017a..b012634 100644 --- a/Assets/Scripts/Manager/UnitMng.cs +++ b/Assets/Scripts/Manager/UnitMng.cs @@ -227,6 +227,7 @@ public void Building(int cost, int index, int unitindex) if (GameMng.I._gold >= cost) { GameMng.I.selectedTile._unitObj._bActAccess = false; + Debug.Log("1" + GameMng.I.selectedTile._unitObj._bActAccess + "unit " + GameMng.I.selectedTile._unitObj); GameObject Child = Instantiate(builtObj[index - 200], GameMng.I.targetTile.transform) as GameObject; GameMng.I.targetTile._builtObj = Child.GetComponent(); diff --git a/Assets/Scripts/Unit/Unit.cs b/Assets/Scripts/Unit/Unit.cs index 9c56bfc..5831413 100644 --- a/Assets/Scripts/Unit/Unit.cs +++ b/Assets/Scripts/Unit/Unit.cs @@ -16,6 +16,8 @@ public class Unit : DynamicObject public string _unitDesc; // 유닛 생성 시 나오는 설명 + public bool _actdebuff = false; + /** * @brief 유닛 생성 대기 및 생성 함수 */ @@ -63,13 +65,14 @@ public void maintenance() NetworkMng.getInstance.SendMsg(string.Format("DIE_UNIT:{0}:{1}", PosX, PosZ)); } } - else if (GameMng.I.countHungry > (NetworkMng.getInstance.v_user.Count * 6)) + else if (GameMng.I.countHungry > (NetworkMng.getInstance.v_user.Count * 6) && !_actdebuff) { // 랜덤 행동불능 (확률 %) int percent = Random.Range(1, 100); if (percent > 80) { _bActAccess = false; + _actdebuff = true; } } else if (GameMng.I.countHungry > (NetworkMng.getInstance.v_user.Count * 3)) @@ -78,8 +81,11 @@ public void maintenance() _hp -= 1; } - if (GameMng.I.countHungry >= 0) + if (GameMng.I.countHungry < 0 && _actdebuff) + { _bActAccess = true; + _actdebuff = false; + } if (_hp < 1) { diff --git a/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png new file mode 100644 index 0000000000000000000000000000000000000000..5836be3e8227b9f6786f5a7a81f66c0e49c6b0b6 GIT binary patch literal 4158 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 YlH|05Ms;SlmH+VFHh4H^I58Ff0=-3##sB~S literal 0 HcmV?d00001 diff --git a/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png.meta b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png.meta new file mode 100644 index 0000000..83c6010 --- /dev/null +++ b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_00.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b93c9fbba8889e5419c26ddb2a6316eb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_01.png b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_01.png new file mode 100644 index 0000000000000000000000000000000000000000..287a4b4d15f0a1bb5ffab39c9633d1dc4bbba969 GIT binary patch literal 5442 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 Dd}Zaf literal 0 HcmV?d00001 diff --git a/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png.meta b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png.meta new file mode 100644 index 0000000..dc2817e --- /dev/null +++ b/Assets/Sprites/hexagon-pack/PNG/Tiles/Sea/ui_sea_02.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 3c9fe331726228e4fb20fc69d80ef001 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: