diff --git a/Assets/GWConquest/Prefabs/Formation.prefab b/Assets/GWConquest/Prefabs/Formation.prefab index f34ccdb..7b1ae52 100644 --- a/Assets/GWConquest/Prefabs/Formation.prefab +++ b/Assets/GWConquest/Prefabs/Formation.prefab @@ -159,6 +159,8 @@ MonoBehaviour: movingArmyPrefab: {fileID: 7920185636364354306, guid: 233d61789cbb0504cb4f2605549a5fd2, type: 3} movementSpeed: 150 + formationNumber: -1 + keepFormationName: 0 --- !u!114 &-4037000077425190141 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab index b9c1928..f5cfbfe 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab @@ -54,6 +54,7 @@ MonoBehaviour: m_EditorClassIdentifier: LeaderIcon: {fileID: 4113838704102956769} FormationNameText: {fileID: 1816981237351840951} + FormationLeaderText: {fileID: 8558640586982011803} IconTransform: {fileID: 1344135612055161323} IconPrefab: {fileID: 1687732570946376588, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} @@ -251,7 +252,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'Castor Caine + m_Text: ' ' --- !u!1001 &1034474529041651908 @@ -395,7 +396,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a45a44e60a3d80d4abd69aeb80ed3f15, + objectReference: {fileID: 21300000, guid: 43c0c67fc0299df49ad542b1d669f483, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} diff --git a/Assets/GWConquest/Prefabs/UI/Button.prefab b/Assets/GWConquest/Prefabs/UI/Button.prefab new file mode 100644 index 0000000..55fbb71 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/Button.prefab @@ -0,0 +1,274 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1328854922835443673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7072474913638833533} + - component: {fileID: 4968280891475022357} + - component: {fileID: 116803036596692165} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7072474913638833533 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328854922835443673} + 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_Children: [] + m_Father: {fileID: 2546910633527798616} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4968280891475022357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328854922835443673} + m_CullTransparentMesh: 0 +--- !u!114 &116803036596692165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328854922835443673} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!1 &1441723235595607368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2546910633527798616} + - component: {fileID: 2787155983571684889} + - component: {fileID: 9101891184351576439} + - component: {fileID: 2472813335678215477} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2546910633527798616 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441723235595607368} + 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_Children: + - {fileID: 7016372118154097431} + - {fileID: 7072474913638833533} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2787155983571684889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441723235595607368} + m_CullTransparentMesh: 0 +--- !u!114 &9101891184351576439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441723235595607368} + 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: 0, g: 0, b: 0, a: 0.6901961} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &2472813335678215477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441723235595607368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 0.6901961} + m_HighlightedColor: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.6901961} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.6901961} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 0.6901961} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9101891184351576439} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7571096867345319568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7016372118154097431} + - component: {fileID: 356696053753016163} + - component: {fileID: 5779923965081711651} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7016372118154097431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571096867345319568} + 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_Children: [] + m_Father: {fileID: 2546910633527798616} + m_RootOrder: 0 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &356696053753016163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571096867345319568} + m_CullTransparentMesh: 0 +--- !u!114 &5779923965081711651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571096867345319568} + 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: 0.33333334} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 3 diff --git a/Assets/GWConquest/Prefabs/UI/Button.prefab.meta b/Assets/GWConquest/Prefabs/UI/Button.prefab.meta new file mode 100644 index 0000000..be77017 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 33c4cb604a7a3db48b51a358e1d9692a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/UI/InputField.prefab b/Assets/GWConquest/Prefabs/UI/InputField.prefab new file mode 100644 index 0000000..32dc6fc --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/InputField.prefab @@ -0,0 +1,373 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6773398751726029864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6773398751726029867} + - component: {fileID: 6773398751726029861} + - component: {fileID: 6773398751726029866} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6773398751726029867 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751726029864} + 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_Children: [] + m_Father: {fileID: 6773398751860747756} + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6773398751726029861 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751726029864} + m_CullTransparentMesh: 0 +--- !u!114 &6773398751726029866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751726029864} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &6773398751741966322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6773398751741966317} + - component: {fileID: 6773398751741966319} + - component: {fileID: 6773398751741966316} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6773398751741966317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751741966322} + 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_Children: [] + m_Father: {fileID: 6773398751860747756} + m_RootOrder: 0 + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6773398751741966319 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751741966322} + m_CullTransparentMesh: 0 +--- !u!114 &6773398751741966316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751741966322} + 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: 0.8301887, g: 0.8301887, b: 0.8301887, a: 0.5} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 14 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Unit Name +--- !u!1 &6773398751860747757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6773398751860747756} + - component: {fileID: 6773398751860747753} + - component: {fileID: 6773398751860747758} + - component: {fileID: 6773398751860747759} + m_Layer: 5 + m_Name: InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6773398751860747756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751860747757} + 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_Children: + - {fileID: 6773398751741966317} + - {fileID: 6773398751726029867} + - {fileID: 6773398751983479693} + 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: 218.69, y: -114} + m_SizeDelta: {x: 271.33258, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6773398751860747753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751860747757} + m_CullTransparentMesh: 0 +--- !u!114 &6773398751860747758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751860747757} + 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: 0, g: 0, b: 0, a: 0.69411767} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &6773398751860747759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751860747757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 0.6901961} + m_HighlightedColor: {r: 0.106000006, g: 0.106000006, b: 0.106000006, a: 0.6901961} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.6901961} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6773398751860747758} + m_TextComponent: {fileID: 6773398751726029866} + m_Placeholder: {fileID: 6773398751741966316} + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 0 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 +--- !u!1 &6773398751983479698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6773398751983479693} + - component: {fileID: 6773398751983479695} + - component: {fileID: 6773398751983479692} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6773398751983479693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751983479698} + 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_Children: [] + m_Father: {fileID: 6773398751860747756} + m_RootOrder: 2 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6773398751983479695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751983479698} + m_CullTransparentMesh: 0 +--- !u!114 &6773398751983479692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773398751983479698} + 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: 0.33333334} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 3 diff --git a/Assets/GWConquest/Prefabs/UI/InputField.prefab.meta b/Assets/GWConquest/Prefabs/UI/InputField.prefab.meta new file mode 100644 index 0000000..d8c216f --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/InputField.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7753330027a692f4ea43e0e57ab3dfc0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/Database/Heroes.csv b/Assets/GWConquest/Resources/Database/Heroes.csv new file mode 100644 index 0000000..8fd4aca --- /dev/null +++ b/Assets/GWConquest/Resources/Database/Heroes.csv @@ -0,0 +1,48 @@ +Name,Title,Faction,Level,Role,Ability 1 Name,Ability 1 A/P,Ability 1 Description,Ability 2 Name,Ability 2 A/P,Ability 2 Description,Finest Hour?,Trigger Finest Hour (Sternstunden),Finest Hour Description,Unlocked by +Krendel Celmoar,Lord Commander of the first Host,Caer Bannoq,2,C,Bane of Beasts,P,When Fighting against Subhumans gain Strengh,Traitor's End,P,Easier to find spys,YES,,,Caer Bannoq +Kerner Holg,Bannerlord,Caer Bannoq,1,C,Beastslayer,A,Damage boost wenn fighting ____,Raise the Banners,P,Recruiting Bonus,NO,,,Caer Bannoq +Lorazam,Firstborn General,Exan,3,C,Analyst Supreme,P,"Enemy units are revealed faster and less terrain debuffs,",Originality is key,A,,YES,Randomly,See the weaknesses of units so they will be tagetted by the most effective anti units. dumm es englisch ja!,Exan +Salaram,"Claw Captain ""The Ravager""",Exan,1,C,Between the treetops,P,Benefits to unit speed in jungle,,A,Units move faster to flank and back,,,, +Karakan,"Claw Captain ""The Raider""",Exan,1,C,Jungle Dweller,P,Benefits to cover etc in jungle + stealth,From the thicket,A,,NO,,,Exan +Mimey Cattai,Commander-In-Chief,Republic,3,C/F,FIUS Founder,P,"Loyalty Bonus, more taxes, faster change in hostile planets",Instigation,A,Decreases Loyalty of besieged Planets. May sometimes spawn groups of Partisans in enemy cities.,YES,,,Directly +Castor Caine,Captain,Republic,1,C,Improvise and Overcome,A,"Bonus of infantry against tanks, defence bonus in cities, stealth bonus in forests, jungles etc.",,A,Creates Command Squad ???,YES,Outnumbered and attacking,Gain Morale and Attack Bonus,Directly +Filey Cattai,Assassin,Republic,1,A,Your time has come,A,Assassinate enemy leader?,Ghostwalk,A,,NO,,,Rokurant Mission I +Varus Raukaan,Admiral,Republic,1,F,Emergency Training,P,Crew has advanced Defence Bonus for Boarding Actions,,P,,NO,,,Directly +Argon Breijin,Captain,Republic,1,F,Strike from the Storm,A,Deployment Bonus speed but quicker detection,Underrun and vanish,A,Retreat Bonus speed with less damage penalty,NO,,,Directly +Hyronimus Hoth,General,Republic,2,C,Winnow the Weak,A,Retreat and march with Damaged units / Sacrifice for big buff ode no cons (Edgy),War of Attrition,P,"Less attrition damage of any kind, especcially snow",NO,,,Tohs/Skaeld Empire +Marcus Patronus,Envoy,Republic,1,A,Spread the truth,A,Reveal something???,Trusted Advisor,P,Boosts Loyalty towards republic on foreign planets that arent hostile,NO,,,Rokurant Mission I +Cyban Paabs,Dominator/Arch Director,Rimspace,3,A,The Sence/Septence/Seventh Stratagem/Serpent,P,Reveal something???,The Final act dawns,A,,YES,,,Rimspace +Joruus So'lar,Warmaster,Rimspace,1,C/F,Blinding Light/Illuminate them,A,,The players/actors are assembled,P,,NO,,,Rimspace Mission I +Liandra Crohn,Chamberlain,Rimspace,1,C,A serpent's whisper,P,Reveal enemys positions,A snake in the garden,A,,NO,,,Rimspace +Seev'Tration,Captain,Rokurant,2,C/F,Supplyer Extraordinaire,P,"Units can hold 5 percent more ammo and food, Transporters 10, Speed of Transporters is enhanced",Sworn Attacker,P,,YES,,,Rokurant +Volkmar,High Chancellor,Rokurant,3,A,Invoke Prejudice,A,"Recruits cooldown is halved for a time, after which there is a negative effect of 25 percent",Bolster Production,A,Increases the output of all factories,YES,After prducing x number of stuff,,Rokurant +Vladislav Raginis,Admiral,Sartorius,1,F,Hardened Veteran,P,,Are you questioning me?,P,,NO,,,Sartorius +Varrius Praahl,Count Opnizev,Sartorius,2,C,Gold doesn't lie,A,Enemy Low Tier Units with low morale can be bought by chance after triggering the effect ,Pay my price,P,,YES,,,Sartorius +Caras Enceladon,General,Voteine,2,C/F,There shall be peace,P,,The Way of the Shield,A,,NO,,,Voteine +Kat Teska,Captain,Voteine,2,C/F,Ebb and Flow,A,Withdrawal is faster and less troops get damaged,The Way of the Sword,A,,YES,,,Voteine +Brockman,"General ""The Flayer""",Wythler,3,C,War Must Feed itself,P,Conquered cities refill a large part of the attacking army's supplies at the cost of the conquered city's loyalty.,Conscription by Force,A,Instantly spawns several Conscript units while damaging loyalty.,YES,Outnumbering the enemy 2 to 1,,An Empire's End / Birth of the Dominion: +Moris Wyerly,-,Wythler,3,C/F,Subjugator,P,"Production is doubled, units deal __ more damage, ...",Precognition,A,"Subjugator is paused, reveal Cattai, alle Phase lanes, Truppenstärken auf Planeten sehen,",YES,,,An Empire's End / Birth of the Dominion: +Munkhtuur,Khaptan Boyar,Wythler,1,F,Ravaging Parties,A,"When present of a planet or in space, all facilites and stations get a debuff, low chance of conquering or spawning a troop",,P,,NO,,,Directly +Sarrow,"Shadow Agent ""The Shadow""",Wythler,1,A,For whome the bell tolls,A,Enemy leader gets damaged; army veterancy bonus disabled,Your'e in my sight,P,Removes an enemy infantry unit / damages an arbitrary unit,NO,,,Directly +Darkex,Shadow Agent,Wythler,1,A,A talent for murder,A,Increases damage against leaders and specialist squads for a time???,Leave no Witness,P,Decreases Damage of already damaged units,NO,,,An Empire's End / Birth of the Dominion: +Soka,Shadow Agent,Wythler,1,A,War in the Shadows,P,Spawns troops randomly and give them stealth?,Murder made history,P,After killing a commander get stealthed and a speed bonus.,NO,,,The new Power II +Nudo P'ta,General,Wythler,3,C/F,Dominate / Overwhelm them ,A,,All walls come down,P,Damage against structures and defending units,YES,Last remaining city on planet is besieged,,A new Way of War/Death of Brockman +Sukhbataar,Khan,Wythler,2,C/F,My loyalty in Iron,P,Overwhelming morale bonus for Wythler units. Small morale malus for conscripted non-Wythler units.,The Fallen Throne,P,Bonus to Elite Units,YES,,,Choice 1 +Dzhambul,Khan,Wythler,2,C/F,Hunt them down,A,,The Reckoning,A,Restore Morale and Attack,YES,Recover troops and strike harder,,Choice 2 +Batukhan,Khan,Wythler,2,C/F,Ride like the wind,A,"For this turn, all units in the army attack first.",Where the wild winds blow,P,"Speed Bonus, Bonus to Hovercrafts",YES,,,Choice 3 +Gharunguur,"""The Bone Grinder""",Wythler,1,C,Marked for Censure,A,Destroys wavering troop for attack bonus of all others,Gewaltmarsch,P,"Speed Bonus, Costs lives",NO,,,An Empire's End / Birth of the Dominion: +Sarv Te'kal,Kaptan,Yarkassy,1,C,Dunerider,P,Less vehicle debuff in deserts,Oathkeeper/Valiant Defender,P,,YES,Outnumbered and defending,Gain Morale and Defence Bonus,Directly +Weser Teng,Admiral,Yarkassy,1,F,Stormlander,P,30% faster landind speed from orbit,,P,,NO,,,Yar'Kassy Defiant +Lahit Lazar,Fleet Kaptan,Yarkassy,1,F,Thrust of the Sunspear,A,"Increases Attack of all Yarkassy Ships in Fleet, but makes them vulnerable",,P,,NO,,,Yar'Kassy Defiant +Karkaah,The Outcast,Republic,1,A,Teller of truth,P,Reveal enemy commander and unit with most HP,It's all a lie,A,,NO,,,Traitors! +Fleier Hostedd,First Regent,Elysia,2,C,Unwavering,P,Morale Bonus to all Elysian Units,Brush off what clutters,A,,NO,,,Elysia +Aymen Caruso,Captain,Elysia,1,C/F,See through their lies,A,"Reveal (spy, hidden units, traitors, ...)",Judgement has arrived,A,,NO,,,Elysia +Or Rhmoy,Techlord,Zami,1,C,I am Apotheosis!,P,Buff?,Total Control,A,Removes debuffs from Zami units,NO,,,Zami +Tyr Antiklos,Technarch,Zami,2,C,Keeper of Secrets,A,(re)Hide 4 units and reveal 2,An Ancient's Prowess,P,,NO,,,Zami Mission I +Tybor Watt,Technarch,Zami,1,C,Clonelord,A,"Opening the vaults? Wird das getriggert, vllt lieber ein Event wo er auf Zami 2 ist...",The endless horde,P,Recruitment Bonus for Zami troops,NO,,,Zami +Oberon,Vargheis,Inobria,1,C,Welcome to my world of darkness,A,Decreases Sight and uncover propability,From the shadows / I am your worst nightmare / That which lurks below,P,"Stealth Bonus to infantry, etc",NO,,,Inobria +Learnean Vern,Freekorps Captain,Vesparus,1,C,Vesparus! For freedom or death especcially on Vespraurs / The glass turns the grains fall,A,"Speed Bonus, Attack Bonus, Damage penalty",In His Memory,P,Loyalty Bonus ,NO,,,The legend spreads +Urluck Ull,Cephalot of the Depths,Noser,2,C,From the Depth,A,On worlds with water cover bonus?,Still waters run deep,P,Secrecy Bonus to Feldlager Units,NO,,,Noser +Kvig Scroohl/Jeg Chaq/ Nith Knirves,First Trade Guild Governor,Arca,1,C,Incentivise,A,Spend Credits to boost morale,All that gold could buy,P,Spend Credits to decrease attack probablity and morale,NO,,,Arca +Naharis,Lord Keeper,Amothep,1,C,,,,,,,NO,,, +Mauth Tinkeelz,?,Cazoon,1,A,Let me tell you a story,A,,From a certain point of view,A,,NO,,,Spice \ No newline at end of file diff --git a/Assets/GWConquest/Resources/Database/Heroes.csv.meta b/Assets/GWConquest/Resources/Database/Heroes.csv.meta new file mode 100644 index 0000000..a944298 --- /dev/null +++ b/Assets/GWConquest/Resources/Database/Heroes.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7582ecf4537ca1a41a0ebdf0918a90f8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png b/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png new file mode 100644 index 0000000..4ab0f94 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png.meta new file mode 100644 index 0000000..f1e9eef --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroBatukhan.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 900ee2d11a2136c4194af7a2b8a22e76 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png b/Assets/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png new file mode 100644 index 0000000..2a5178e Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png.meta new file mode 100644 index 0000000..7679081 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroCarasEnceladon.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: fc1375b67c3eb0e4586f3dd879e65308 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroCastorCaine.png b/Assets/GWConquest/Resources/UnitIcons/HeroCastorCaine.png new file mode 100644 index 0000000..72b4366 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroCastorCaine.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroCastorCaine.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroCastorCaine.png.meta new file mode 100644 index 0000000..b1569c0 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroCastorCaine.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: e1eeee4933775d945b161e34ba031c1f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroDzhambul.png b/Assets/GWConquest/Resources/UnitIcons/HeroDzhambul.png new file mode 100644 index 0000000..d915680 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroDzhambul.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroDzhambul.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroDzhambul.png.meta new file mode 100644 index 0000000..e3e3973 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroDzhambul.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: dbb95fee51cce5542b248ee9a898759c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroKernerHolg.png b/Assets/GWConquest/Resources/UnitIcons/HeroKernerHolg.png new file mode 100644 index 0000000..51e35a3 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroKernerHolg.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroKernerHolg.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroKernerHolg.png.meta new file mode 100644 index 0000000..90936e9 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroKernerHolg.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 48ac33bfa95be6f43b1517bd903864d0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png b/Assets/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png new file mode 100644 index 0000000..5a7bd20 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png.meta new file mode 100644 index 0000000..b2f4924 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroMimeyCattai.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 916a4eadb9ccb9c4d86a887cca4accb3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png b/Assets/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png new file mode 100644 index 0000000..9f47c7c Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png.meta new file mode 100644 index 0000000..a6bac4a --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroMorisWyerly.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: d03e6e007c6477640a67e65ac6ee5823 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroPlaceholder.png b/Assets/GWConquest/Resources/UnitIcons/HeroPlaceholder.png new file mode 100644 index 0000000..2300749 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroPlaceholder.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroPlaceholder.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroPlaceholder.png.meta new file mode 100644 index 0000000..052047b --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroPlaceholder.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 29a946b9c5bdbd749b55ef25d7829cde +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroSarrow.png b/Assets/GWConquest/Resources/UnitIcons/HeroSarrow.png new file mode 100644 index 0000000..9d054fd Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroSarrow.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroSarrow.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroSarrow.png.meta new file mode 100644 index 0000000..ea609db --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroSarrow.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 66b034bdcfd6d064a94c204bdac3e163 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroSarvTekal.png b/Assets/GWConquest/Resources/UnitIcons/HeroSarvTekal.png new file mode 100644 index 0000000..81844e2 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroSarvTekal.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroSarvTekal.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroSarvTekal.png.meta new file mode 100644 index 0000000..3fe8396 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroSarvTekal.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: ab3a7db4643127f4bbcbc1f76b6fada0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png b/Assets/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png new file mode 100644 index 0000000..22b42d2 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png.meta new file mode 100644 index 0000000..f49d4f7 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroVarriusPraal.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 04a5789924f1f324d80c0fa6165efa7b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Resources/UnitIcons/HeroVolkmar.png b/Assets/GWConquest/Resources/UnitIcons/HeroVolkmar.png new file mode 100644 index 0000000..cc94029 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroVolkmar.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroVolkmar.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroVolkmar.png.meta new file mode 100644 index 0000000..da378c2 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroVolkmar.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: d173ade8f8bf6d74dae6bdcd54a3259e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 64754d9..0668659 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -12780,6 +12780,150 @@ MonoBehaviour: RecruitSprite: {fileID: 21300000, guid: 37886999ca665794c9a20cebe80d56cc, type: 3} AmmoSprite: {fileID: 21300000, guid: 9dd934dc01acfe443a7ff320f825e6fe, type: 3} FuelSprite: {fileID: 21300000, guid: 461b4d80f47ed85478b3c190ac7bd4ce, type: 3} +--- !u!1001 &218888188 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 587515776} + m_Modifications: + - target: {fileID: 6773398751741966316, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Text + value: 'Planet + +' + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 600.72 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -114 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.x + value: 109.81494 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747757, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Name + value: PlanetInput + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7753330027a692f4ea43e0e57ab3dfc0, type: 3} +--- !u!224 &218888189 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 218888188} + m_PrefabAsset: {fileID: 0} +--- !u!114 &218888190 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 218888188} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &220338671 PrefabInstance: m_ObjectHideFlags: 0 @@ -14931,6 +15075,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 276098500} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!224 &276111185 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 6773398751593558717} + m_PrefabAsset: {fileID: 0} --- !u!1001 &276979825 PrefabInstance: m_ObjectHideFlags: 0 @@ -21134,7 +21284,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_AnchoredPosition.y - value: -36.97 + value: -65.92817 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -21144,7 +21294,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.y - value: -289.60767 + value: -231.85634 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -24515,11 +24665,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1b9220863ccc39c4fb21b86b6156cd7c, type: 3} m_Name: m_EditorClassIdentifier: - PlayerColors: - - {r: 1, g: 0.8901961, b: 0.5647059, a: 1} - - {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} - - {r: 0.8000001, g: 0.25490198, b: 0.14509805, a: 1} - - {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} + Factions: + - FactionColor: {r: 1, g: 0.8901961, b: 0.5647059, a: 1} + FactionName: Republic Remnants + FactionLogo: {fileID: 21300000, guid: 43c0c67fc0299df49ad542b1d669f483, type: 3} + StartingPlanets: + - {fileID: 193885456} + - {fileID: 282969352} + - {fileID: 94489304} + - FactionColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} + FactionName: Wythler Dominion + FactionLogo: {fileID: 21300000, guid: 6504d938d9c4bb845a57b23e1fecfed7, type: 3} + StartingPlanets: + - {fileID: 7904168} + - {fileID: 1487285353} + - {fileID: 1821819294} + - {fileID: 303737094} + - FactionColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} + FactionName: Rebels + FactionLogo: {fileID: 21300000, guid: 00e5899d4e6e5a043a58bc84abb91edd, type: 3} + StartingPlanets: [] UnitClasses: [] PlanetData: - Name: Aeculus @@ -28606,6 +28771,7 @@ RectTransform: - {fileID: 1642390277} - {fileID: 657809897} - {fileID: 765894939} + - {fileID: 587515776} m_Father: {fileID: 1986334066} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28631,6 +28797,7 @@ MonoBehaviour: UnitIcons: {fileID: 300495110} PlanetNames: {fileID: 125481610} PlanetConnections: {fileID: 850140850} + DebugUI: {fileID: 587515775} doubleClickInterval: 0.2 --- !u!1 &494421157 GameObject: @@ -31585,6 +31752,11 @@ PrefabInstance: propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} + - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: m_SizeDelta.x + value: 13 + objectReference: {fileID: 0} - target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_FontData.m_Alignment @@ -31610,6 +31782,16 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Total + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Balance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4096209424666407829, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchorMin.x @@ -31669,7 +31851,7 @@ PrefabInstance: - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchoredPosition.x - value: -99.8 + value: -65.8 objectReference: {fileID: 0} - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -31693,6 +31875,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} +--- !u!114 &551233957 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + m_PrefabInstance: {fileID: 551233956} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96bcd96c5c3a2fc45b2236f5c620ea0a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &554970371 PrefabInstance: m_ObjectHideFlags: 0 @@ -33309,6 +33503,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 586970766} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &587515775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587515776} + - component: {fileID: 587515777} + m_Layer: 5 + m_Name: DebugUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &587515776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587515775} + 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_Children: + - {fileID: 276111185} + - {fileID: 1106155158} + - {fileID: 5979238412282691983} + - {fileID: 1278702604} + - {fileID: 218888189} + m_Father: {fileID: 494226835} + m_RootOrder: 10 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &587515777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587515775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd50aa86ec1f15748b6fbd6f4220e614, type: 3} + m_Name: + m_EditorClassIdentifier: + UnitNameText: {fileID: 6773398751593558718} + AmountText: {fileID: 1106155159} + PlanetText: {fileID: 218888190} + PlayerText: {fileID: 1278702605} --- !u!1001 &589985524 PrefabInstance: m_ObjectHideFlags: 0 @@ -37858,6 +38109,8 @@ GameObject: - component: {fileID: 692834480} - component: {fileID: 692834479} - component: {fileID: 692834481} + - component: {fileID: 692834482} + - component: {fileID: 692834483} m_Layer: 0 m_Name: GameObject m_TagString: Untagged @@ -37879,6 +38132,7 @@ MonoBehaviour: m_EditorClassIdentifier: unitName: Conscripts unitCount: 20 + playerId: 1 zone: {fileID: 801858043} --- !u!4 &692834480 Transform: @@ -37908,6 +38162,39 @@ MonoBehaviour: m_EditorClassIdentifier: unitName: HeavyTank unitCount: 5 + playerId: 1 + zone: {fileID: 801858043} +--- !u!114 &692834482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692834478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: HeroMorisWyerly + unitCount: 1 + playerId: 1 + zone: {fileID: 801858043} +--- !u!114 &692834483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692834478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: HeroMimeyCattai + unitCount: 1 + playerId: 0 zone: {fileID: 801858043} --- !u!1001 &693605575 PrefabInstance: @@ -61275,6 +61562,165 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1274418813} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1106155157 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 587515776} + m_Modifications: + - target: {fileID: 6773398751741966316, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Text + value: 'Amount + +' + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 411.64 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -114 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.x + value: 95.61746 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747757, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Name + value: AmountInput + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_ContentType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_KeyboardType + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_CharacterValidation + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7753330027a692f4ea43e0e57ab3dfc0, type: 3} +--- !u!224 &1106155158 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 1106155157} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1106155159 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 1106155157} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1107108978 PrefabInstance: m_ObjectHideFlags: 0 @@ -66195,7 +66641,7 @@ PrefabInstance: - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_SizeDelta.x - value: 39 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -66210,12 +66656,12 @@ PrefabInstance: - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: Total - value: 444 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: Balance - value: 88 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4096209425149672179, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -66236,7 +66682,7 @@ PrefabInstance: - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchoredPosition.x - value: 91.87012 + value: 65.87012 objectReference: {fileID: 0} - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -66251,6 +66697,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1208637974} m_PrefabAsset: {fileID: 0} +--- !u!114 &1208637976 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + m_PrefabInstance: {fileID: 1208637974} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96bcd96c5c3a2fc45b2236f5c620ea0a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1209616464 GameObject: m_ObjectHideFlags: 0 @@ -70013,6 +70471,165 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1276485812} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1278702603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 587515776} + m_Modifications: + - target: {fileID: 6773398751741966316, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Text + value: 'Player + +' + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 504.28 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -114 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.x + value: 69.17282 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747757, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Name + value: PlayerInput + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_ContentType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_KeyboardType + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_CharacterValidation + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7753330027a692f4ea43e0e57ab3dfc0, type: 3} +--- !u!224 &1278702604 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 1278702603} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1278702605 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 1278702603} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1278756751 GameObject: m_ObjectHideFlags: 0 @@ -95153,7 +95770,7 @@ MonoBehaviour: m_EditorClassIdentifier: zoneId: 162 attackZone: 0 - mainZone: 0 + mainZone: 1 --- !u!4 &1758196034 Transform: m_ObjectHideFlags: 0 @@ -107919,6 +108536,11 @@ PrefabInstance: propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} + - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: m_SizeDelta.x + value: 13 + objectReference: {fileID: 0} - target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_FontData.m_Alignment @@ -107949,6 +108571,16 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Total + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Balance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4096209424666407829, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchorMin.x @@ -108013,7 +108645,7 @@ PrefabInstance: - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchoredPosition.x - value: -99.8 + value: -65.8 objectReference: {fileID: 0} - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -108037,6 +108669,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} +--- !u!114 &1911391039 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + m_PrefabInstance: {fileID: 1911391038} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96bcd96c5c3a2fc45b2236f5c620ea0a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1912519794 GameObject: m_ObjectHideFlags: 0 @@ -110731,6 +111375,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1967795786} + - component: {fileID: 1967795787} m_Layer: 5 m_Name: GameUI m_TagString: Untagged @@ -110762,6 +111407,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1967795787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967795785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12e3f8defa6efc34191df9e8bf49dda2, type: 3} + m_Name: + m_EditorClassIdentifier: + CreditsDisplay: {fileID: 4096209424578181650} + FoodDisplay: {fileID: 551233957} + SuppliesDisplay: {fileID: 1911391039} + FuelDisplay: {fileID: 1208637976} --- !u!1001 &1968865933 PrefabInstance: m_ObjectHideFlags: 0 @@ -122111,10 +122772,25 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: m_SizeDelta.x + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Total + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + propertyPath: Balance + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} propertyPath: m_AnchoredPosition.x - value: 99.87012 + value: 65.87012 objectReference: {fileID: 0} - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, type: 3} @@ -122129,6 +122805,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4096209424578181648} m_PrefabAsset: {fileID: 0} +--- !u!114 &4096209424578181650 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4096209424578181651, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, + type: 3} + m_PrefabInstance: {fileID: 4096209424578181648} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96bcd96c5c3a2fc45b2236f5c620ea0a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4404603246228816359 PrefabInstance: m_ObjectHideFlags: 0 @@ -122372,6 +123060,168 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ca2c2b7050c3254bb98a6cb77f2a4ba, type: 3} +--- !u!1001 &5979238412282691982 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 587515776} + m_Modifications: + - target: {fileID: 116803036596692165, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_Text + value: 'Spawn + +' + objectReference: {fileID: 0} + - target: {fileID: 1441723235595607368, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 587515777} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ClickSpawnButton + objectReference: {fileID: 0} + - target: {fileID: 2472813335678215477, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 712.9 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -114 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_SizeDelta.x + value: 84.72113 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 33c4cb604a7a3db48b51a358e1d9692a, type: 3} +--- !u!224 &5979238412282691983 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2546910633527798616, guid: 33c4cb604a7a3db48b51a358e1d9692a, + type: 3} + m_PrefabInstance: {fileID: 5979238412282691982} + m_PrefabAsset: {fileID: 0} --- !u!33 &6575311300241926498 MeshFilter: m_ObjectHideFlags: 0 @@ -122551,6 +123401,137 @@ Transform: m_Father: {fileID: 1095562662} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -4.5940003, z: 0} +--- !u!1001 &6773398751593558717 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 587515776} + m_Modifications: + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 218.69 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -114 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.x + value: 271.33258 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747756, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6773398751860747757, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + propertyPath: m_Name + value: UnitNameInput + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7753330027a692f4ea43e0e57ab3dfc0, type: 3} +--- !u!114 &6773398751593558718 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6773398751860747759, guid: 7753330027a692f4ea43e0e57ab3dfc0, + type: 3} + m_PrefabInstance: {fileID: 6773398751593558717} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6924224162648186796 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/CSVReader.cs b/Assets/GWConquest/Scripts/CSVReader.cs index 3e67907..60a5bb7 100644 --- a/Assets/GWConquest/Scripts/CSVReader.cs +++ b/Assets/GWConquest/Scripts/CSVReader.cs @@ -105,7 +105,7 @@ namespace GWConquest }; for (int j = 0; j < fieldCount; j++) { - UnityEngine.Debug.LogFormat("added header {0} {1}", headers[j], j); + //UnityEngine.Debug.LogFormat("added header {0} {1}", headers[j], j); file.headers.Add(headers[j].Trim(), j); } diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index ba7692a..8bb3376 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -16,6 +16,29 @@ namespace GWConquest public Zone Zone { get; private set; } private Planet planet; + public Player ControllingPlayer { + get { + if(state.ControllingPlayerId == -1) + { + return null; + } + else + { + return Player.PlayerList[state.ControllingPlayerId]; + } + } + + set { + if(value == null) + { + state.ControllingPlayerId = -1; + } + else { + state.ControllingPlayerId = value.PlayerId; + } + } + } + public Inventory Inventory; public int StorageCapacity { @@ -28,6 +51,7 @@ namespace GWConquest StorageCapacity = GameManager.Instance.DefaultStorageCapacity; Inventory = new Inventory(state, "Inventory"); Inventory.StorageCapacity = StorageCapacity; + state.ControllingPlayerId = -1; } public void Initialize(Planet _planet) @@ -72,21 +96,38 @@ namespace GWConquest producingItem = "Fuel"; } } + else if (DistrictType == DistrictType.Civil) + { + producingItem = "Recruits"; + } return producingItem; } } + public float ProducingCooldown { + get => GameManager.Instance.DefaultProductionCooldown; + } + public override void SimulateOwner() { string producingItem = ProducingItem; - if(producingItem != null) { + bool producesCredits = DistrictType == DistrictType.Civil && ControllingPlayer != null; + + if(producingItem != null || producesCredits) { if(state.ItemProductionCooldown <= 0f) { - Inventory.AddItem(producingItem, 1); + if(producingItem != null) + { + Inventory.AddItem(producingItem, 1); + } + + if(producesCredits) + { + ControllingPlayer.Credits++; + } - float cooldown = GameManager.Instance.DefaultProductionCooldown; - state.ItemProductionCooldown = cooldown; + state.ItemProductionCooldown = ProducingCooldown; } else { state.ItemProductionCooldown -= BoltNetwork.FrameDeltaTime; diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs index 0b9409b..4af4fe5 100644 --- a/Assets/GWConquest/Scripts/Formation.cs +++ b/Assets/GWConquest/Scripts/Formation.cs @@ -54,9 +54,10 @@ namespace GWConquest public string FormationName { - get - { - return "Army Group"; + get => state.FormationName; + set { + state.FormationName = value; + keepFormationName = true; } } @@ -66,16 +67,29 @@ namespace GWConquest public EntityList UnitEntities; + public EntityList SubFormationEntities; + public Unit[] Units { get => Array.ConvertAll(UnitEntities.ToArray(), e => e.GetComponent()); } + public Unit HeroUnit + { + get => state.HeroUnit?.GetComponent(); + set => state.HeroUnit = value.entity; + } + public IEnumerable AllItems { get => Units.SelectMany(u => u.Inventory); } + public IEnumerable SubFormations + { + get => SubFormationEntities.Select((e,i) => e.GetComponent()); + } + public ZoneList PathQueue; public GameObject fleetIcon; @@ -85,6 +99,9 @@ namespace GWConquest public float movementSpeed = 1f; + public int formationNumber; + public bool keepFormationName = false; + [System.NonSerialized] public bool IsExpandedInMenu = true; @@ -286,6 +303,7 @@ namespace GWConquest { BoltLog.Info("Formation attached: {0}", this); UnitEntities = new EntityList(state, "Units"); + SubFormationEntities = new EntityList(state, "SubFormations"); PathQueue = new ZoneList(state, "PathQueue"); @@ -295,6 +313,8 @@ namespace GWConquest state.IsInTransit = false; CoveredDistance = 0; + + formationNumber = UnityEngine.Random.Range(1, 100); } state.AddCallback("IsInTransit", OnTransitStateChanged); @@ -315,18 +335,25 @@ namespace GWConquest { currentZone.OnFormationChanged(this); } + if(!keepFormationName) + { + ConstructName(); + } OnUnitsChanged?.Invoke(); } public void OnUnitRemoved(Unit unit) { OnUnitsChanged?.Invoke(); + if(!keepFormationName) + { + ConstructName(); + } } public event Action OnUnitsChanged; - - + public float GetModifierForTransition(Zone origin, Zone target) { return 1f; @@ -337,8 +364,81 @@ namespace GWConquest return true; } + public void ConstructName() + { + string name = Util.GetOrdinalString(formationNumber) + " "; + + var units = Units; + float totalUnits = units.Count(); + + if(units.Count(u => u.Class.ZoneType == ZoneType.Ground) / totalUnits >= 0.5) + { + if(units.Count(u => u.Class.UnitType == UnitType.Vehicle) / totalUnits >= 0.3) + { + name += "Armoured"; + } + else if(units.Count(u => u.Class.UnitType == UnitType.Cannon) / totalUnits >= 0.3) + { + name += "Artillery"; + } + else if(units.Count(u => u.Class.UnitType == UnitType.Infantry) / totalUnits >= 0.5) + { + name += "Infantry"; + } + else + { + name += "Combined"; + } + name += " "; + + if(totalUnits < 5) + { + name += "Company"; + } + else if(totalUnits < 10) + { + name += "Battalion"; + } + else if(totalUnits < 20) + { + name += "Division"; + } + else if(totalUnits < 40) + { + name += "Corps"; + } + else if(totalUnits < 60) + { + name += "Army"; + } + } + else { + if(totalUnits < 5) + { + name += "Squadron"; + } + else if(totalUnits < 10) + { + name += "Flotilla"; + } + else if(totalUnits < 20) + { + name += "Strike Group"; + } + else if(totalUnits < 40) + { + name += "Fleet"; + } + else if(totalUnits < 60) + { + name += "Grand Fleet"; + } + } + + state.FormationName = name; + } + } - } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/GWCamera.cs b/Assets/GWConquest/Scripts/GWCamera.cs index 82698fb..55c5bc3 100644 --- a/Assets/GWConquest/Scripts/GWCamera.cs +++ b/Assets/GWConquest/Scripts/GWCamera.cs @@ -96,7 +96,7 @@ namespace GWConquest private void Update() { - if (!IngameUI.PlanetViewEnabled) + if (IngameUI.CanCameraScroll) { float horizontalButtons = Input.GetAxis("Horizontal"); float verticalButtons = Input.GetAxis("Vertical"); diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 1e89aa1..141e955 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -4,7 +4,7 @@ namespace GWConquest { public class GameManager : MonoBehaviour { - public Color[] PlayerColors; + public Faction[] Factions; public UnitClass[] UnitClasses; public PlanetData[] PlanetData; @@ -60,6 +60,7 @@ namespace GWConquest BoltEntity playerEntity = BoltNetwork.Instantiate(BoltPrefabs.Player); IPlayerState playerState = playerEntity.GetState(); ; playerState.IsAI = true; + playerState.FactionIndex = 2; } } diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs b/Assets/GWConquest/Scripts/PlanetRegistry.cs index 4ecd881..2bb062b 100644 --- a/Assets/GWConquest/Scripts/PlanetRegistry.cs +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs @@ -114,7 +114,7 @@ namespace GWConquest break; } - Debug.LogFormat("String {0} gave type {1}", cutStr, type); + //Debug.LogFormat("String {0} gave type {1}", cutStr, type); for(int i = 0; i < count; i++) { factoryList.Add(type); diff --git a/Assets/GWConquest/Scripts/Player.cs b/Assets/GWConquest/Scripts/Player.cs index 0fcb05c..d70b395 100644 --- a/Assets/GWConquest/Scripts/Player.cs +++ b/Assets/GWConquest/Scripts/Player.cs @@ -10,25 +10,34 @@ namespace GWConquest public static Player CurrentPlayer; + public Faction Faction + { + get => GameManager.Instance.Factions[state.FactionIndex]; + } + public Color Color { - get => state.PlayerColor; - set => state.PlayerColor = value; + get => Faction.FactionColor; + } + + public int Credits + { + get => state.Credits; + set => state.Credits = value; + } + + public int PlayerId + { + get => state.PlayerId; } public override void Attached() { + Debug.Log("Attaching player..."); PlayerList.Add(this); if(entity.IsOwner) { state.PlayerId = PlayerList.IndexOf(this); - GameManager gm = GameManager.Instance; - if(gm != null) - { - int color = state.PlayerId % gm.PlayerColors.Length; - Color = gm.PlayerColors[color]; - } - } } @@ -69,5 +78,29 @@ namespace GWConquest entity.AssignControl(Connection); } } + + public void AssignStartingPlanets() + { + if(Faction.StartingPlanets != null) + { + foreach(Planet p in Faction.StartingPlanets) + { + foreach(District d in p.GetComponentsInChildren()) + { + d.ControllingPlayer = this; + } + } + } + } + } + + [System.Serializable] + public class Faction + { + public Color FactionColor; + public string FactionName; + public Sprite FactionLogo; + + public Planet[] StartingPlanets; } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs index 9540db8..538bfb9 100644 --- a/Assets/GWConquest/Scripts/ServerCallbacks.cs +++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs @@ -10,8 +10,11 @@ namespace GWConquest public override void SceneLoadLocalDone(string scene) { BoltEntity playerEntity = BoltNetwork.Instantiate(BoltPrefabs.Player); - IPlayerState playerState = playerEntity.GetState(); ; + Debug.Log("Player entity instantiated"); + IPlayerState playerState = playerEntity.GetState(); playerState.IsHost = true; + playerState.FactionIndex = 0; + playerEntity.GetComponent().AssignStartingPlanets(); playerEntity.TakeControl(); foreach(GameObject go in FindObjectsOfType()) { @@ -25,6 +28,8 @@ namespace GWConquest IPlayerState playerState = playerEntity.GetState(); playerState.ConnectionId = (int)connection.ConnectionId; playerState.IsHost = false; + playerState.FactionIndex = 1; + playerEntity.GetComponent().AssignStartingPlanets(); playerEntity.AssignControl(connection); } @@ -83,5 +88,12 @@ namespace GWConquest unit.CurrentBattle.MoveUnitToReserve(unit); } } + + public override void OnEvent(AssignLeaderEvent evnt) + { + var formation = evnt.Formation.GetComponent(); + var unit = evnt.Unit?.GetComponent(); + formation.HeroUnit = unit; + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/SpawnAIUnits.cs b/Assets/GWConquest/Scripts/SpawnAIUnits.cs index 993c1aa..0352629 100644 --- a/Assets/GWConquest/Scripts/SpawnAIUnits.cs +++ b/Assets/GWConquest/Scripts/SpawnAIUnits.cs @@ -8,13 +8,14 @@ namespace GWConquest { public string unitName; public int unitCount; + public int playerId; public Zone zone; public void OnSceneLoadLocalDone() { BoltLog.Info("Spawning AI units"); - Player player = FindObjectsOfType().FirstOrDefault(p => p.state.IsAI); + Player player = Player.PlayerList[playerId]; if(player != null) { for(int i = 0; i < unitCount; i++) diff --git a/Assets/GWConquest/Scripts/UI/BalanceUI.cs b/Assets/GWConquest/Scripts/UI/BalanceUI.cs new file mode 100644 index 0000000..5c333b2 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/BalanceUI.cs @@ -0,0 +1,44 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace GWConquest +{ + public class BalanceUI : MonoBehaviour + { + public MoneyDisplay CreditsDisplay; + public MoneyDisplay FoodDisplay; + public MoneyDisplay SuppliesDisplay; + public MoneyDisplay FuelDisplay; + + private void FixedUpdate() { + var currentPlayer = Player.CurrentPlayer; + + if(currentPlayer != null) + { + CreditsDisplay.Total = currentPlayer.Credits; + + int totalFood = 0; + int totalSupplies = 0; + int totalFuel = 0; + + foreach(Zone z in Zone.AllZones) + { + District d = z.GetComponent(); + if(d != null && d.ControllingPlayer == currentPlayer) + { + totalFood += d.Inventory.GetItemAmount("Food"); + totalSupplies += d.Inventory.GetItemAmount("Supplies"); + totalFuel += d.Inventory.GetItemAmount("Fuel"); + } + } + + FoodDisplay.Total = totalFood; + SuppliesDisplay.Total = totalSupplies; + FuelDisplay.Total = totalFuel; + } + + + } + } +} + diff --git a/Assets/GWConquest/Scripts/UI/BalanceUI.cs.meta b/Assets/GWConquest/Scripts/UI/BalanceUI.cs.meta new file mode 100644 index 0000000..aa0905e --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/BalanceUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 12e3f8defa6efc34191df9e8bf49dda2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs index 036d7a0..829ce62 100644 --- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs +++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs @@ -154,7 +154,7 @@ namespace GWConquest { public void OnIconDragged(BattleUnitIcon icon, BattleUnitIcon target) { - if(icon.Unit.BattleState == BattleUnitState.InReserve) + if(icon.Unit.BattleState == BattleUnitState.InReserve && icon.Unit.CanGoToFlank) { var flankUI = target.GetComponentInParent(); if(flankUI != null) diff --git a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs index 0da15f9..61db0b0 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs @@ -7,6 +7,7 @@ namespace GWConquest { public class BattleFormationUI : MonoBehaviour { public BattleUnitIcon LeaderIcon; public Text FormationNameText; + public Text FormationLeaderText; public RectTransform IconTransform; @@ -50,7 +51,7 @@ namespace GWConquest { public IEnumerable GetShownUnits() { - return Formation.Units.Where(u => u.BattleState == BattleUnitState.InReserve); + return Formation.Units.Where(u => u.BattleState == BattleUnitState.InReserve && u != Formation.HeroUnit); } public void UpdateUnitIcons() @@ -85,6 +86,18 @@ namespace GWConquest { IconList.Sort((a,b) => BattleUnitIcon.Compare(a.Unit, b.Unit)); + + FormationNameText.text = Formation.FormationName; + + if(Formation.HeroUnit != null) + { + LeaderIcon.Init(Formation.HeroUnit); + FormationLeaderText.text = Formation.HeroUnit.Class.FullName; + } + else { + LeaderIcon.Init(null); + FormationLeaderText.text = ""; + } //UpdateUIPositions(); } diff --git a/Assets/GWConquest/Scripts/UI/DebugUI.cs b/Assets/GWConquest/Scripts/UI/DebugUI.cs new file mode 100644 index 0000000..b11fb1f --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/DebugUI.cs @@ -0,0 +1,47 @@ +using UnityEngine; +using UnityEngine.UI; +using System; +using System.Linq; + +namespace GWConquest +{ + public class DebugUI : MonoBehaviour + { + public InputField UnitNameText; + public InputField AmountText; + public InputField PlanetText; + public InputField PlayerText; + + + public void ClickSpawnButton() + { + if(!int.TryParse(AmountText.text, out int amount)) + throw new ArgumentException("Amount is not an integer"); + + if(!int.TryParse(PlayerText.text, out int playerID)) + throw new ArgumentException("PlayerID is not an integer"); + + if(playerID < 0 || playerID >= Player.PlayerList.Count) + throw new ArgumentException("Player not found"); + + Player player = Player.PlayerList[playerID]; + + UnitClass uc = UnitClass.FromName(UnitNameText.text); + + if(uc == null) + throw new ArgumentException("Unit Class not found"); + + Planet planet = Planet.AllPlanets.FirstOrDefault(p => p.planetName.ToLower().Contains(PlanetText.text.ToLower())); + + Zone zone = planet.GetZones(uc.ZoneType).Where(z => !z.attackZone).First(); + + for(int i = 0; i < amount; i++) + { + Unit.SpawnUnit(zone, uc, player); + } + + } + } +} + + diff --git a/Assets/GWConquest/Scripts/UI/DebugUI.cs.meta b/Assets/GWConquest/Scripts/UI/DebugUI.cs.meta new file mode 100644 index 0000000..2e8756b --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/DebugUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cd50aa86ec1f15748b6fbd6f4220e614 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/DragDropElement.cs b/Assets/GWConquest/Scripts/UI/DragDropElement.cs index 2d926a0..c874fde 100644 --- a/Assets/GWConquest/Scripts/UI/DragDropElement.cs +++ b/Assets/GWConquest/Scripts/UI/DragDropElement.cs @@ -46,6 +46,7 @@ namespace GWConquest OnDragBegin(); origParent = rectTransform.parent; rectTransform.SetParent(rectTransform.GetComponentInParent().transform); + rectTransform.SetAsLastSibling(); } } diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs index 03ebe5c..ffc7a43 100644 --- a/Assets/GWConquest/Scripts/UI/IngameUI.cs +++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs @@ -27,6 +27,7 @@ namespace GWConquest public GameObject UnitIcons; public GameObject PlanetNames; public GameObject PlanetConnections; + public GameObject DebugUI; public float doubleClickInterval = 0.1f; @@ -71,7 +72,11 @@ namespace GWConquest if(Input.GetButtonDown("Cancel")) { - if(PlanetViewEnabled) + if(DebugUI.activeSelf) + { + DebugUI.SetActive(false); + } + else if(PlanetViewEnabled) { if(PlanetView.BattleUI.isActiveAndEnabled) { @@ -87,6 +92,11 @@ namespace GWConquest } } + + if(Input.GetKeyDown(KeyCode.F12)) + { + DebugUI.SetActive(true); + } } private bool SelectIcons(bool doubleClick) @@ -277,6 +287,11 @@ namespace GWConquest PlanetViewEnabled = false; } + + public static bool CanCameraScroll + { + get => !PlanetViewEnabled && !Instance.DebugUI.activeSelf; + } } diff --git a/Assets/GWConquest/Scripts/UI/TransportUI.cs b/Assets/GWConquest/Scripts/UI/TransportUI.cs index a95002f..4728197 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUI.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUI.cs @@ -40,6 +40,7 @@ namespace GWConquest private void Update() { GWLayout.UpdateLayout(GroundPanel.ContentTransform); + GWLayout.UpdateLayout(GroundPanel.ItemsTransform); } private void FixedUpdate() { diff --git a/Assets/GWConquest/Scripts/UI/TransportUIElement.cs b/Assets/GWConquest/Scripts/UI/TransportUIElement.cs index 43c8e1c..3aed62f 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUIElement.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUIElement.cs @@ -24,7 +24,6 @@ namespace GWConquest private GameObject SubElementPrefab { get => GetComponentInParent().ElementPrefab; } - private List ChildrenList = new List(); @@ -73,8 +72,7 @@ namespace GWConquest return District.Zone.Formations; } else { - //TODO - return new List(); + return Formation.SubFormations; } } @@ -97,18 +95,10 @@ namespace GWConquest var AllItems = GetAllItems(); - if(IsDistrict) - { - SpriteImage.sprite = District.GetCurrentSprite(); - NameText.text = District.GetDistrictName(); - } - else { - NameText.text = Formation.FormationName; - } + UpdateDisplay(null); - - + } public void UpdateDisplay(object obj) @@ -136,7 +126,7 @@ namespace GWConquest if(!IsDistrict) { - var AllUnits = Formation.Units; + var AllUnits = Formation.Units.Where(u => u != Formation.HeroUnit); GWLayout.UpdateGameObjects(UnitIconList, AllUnits.ToList(), unit => { var unitIconGO = Instantiate(UnitIconPrefab); @@ -145,6 +135,7 @@ namespace GWConquest var unitIconComp = unitIconGO.GetComponent(); + unitIconComp.ParentElement = this; unitIconComp.UpdateDisplay(unit); return unitIconComp; @@ -167,6 +158,20 @@ namespace GWConquest UnitIconsTransform.SetAsLastSibling(); ItemIconsTransform.SetAsLastSibling(); + + + if(IsDistrict) + { + SpriteImage.sprite = District.GetCurrentSprite(); + NameText.text = District.GetDistrictName(); + } + else { + NameText.text = Formation.FormationName; + if(Formation.HeroUnit != null) + { + SpriteImage.sprite = Formation.HeroUnit.Icon; + } + } } public object GetObject() diff --git a/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs b/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs index 546cd74..d35999b 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs @@ -4,13 +4,16 @@ using UnityEngine.UI; namespace GWConquest { - public class TransportUIUnitIcon : MonoBehaviour, IUpdatable + public class TransportUIUnitIcon : DragDropElement, IUpdatable { public Image Icon; [System.NonSerialized] private Unit Unit; + [System.NonSerialized] + public TransportUIElement ParentElement; + public void UpdateDisplay(Unit unit) { Unit = unit; @@ -22,5 +25,22 @@ namespace GWConquest { return Unit; } + + public override bool OnDragFinished() + { + if(!ParentElement.IsDistrict && Unit.Class.IsHero) + { + var LeaderIcon = ParentElement.SpriteImage.rectTransform; + if(RectTransformUtility.RectangleContainsScreenPoint(LeaderIcon, Input.mousePosition)) + { + AssignLeaderEvent ev = AssignLeaderEvent.Create(Bolt.GlobalTargets.OnlyServer); + ev.Formation = ParentElement.Formation.entity; + ev.Unit = Unit.entity; + ev.Send(); + } + } + + return true; + } } } diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs index 7fd5dd3..09ee359 100644 --- a/Assets/GWConquest/Scripts/Unit.cs +++ b/Assets/GWConquest/Scripts/Unit.cs @@ -105,6 +105,10 @@ namespace GWConquest get => Formation.currentZone.CurrentBattle; } + public bool CanGoToFlank { + get => Class.CanGoToFlank; + } + public Inventory Inventory; public override void Attached() diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index ec1b8e1..e002cbf 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -20,6 +20,9 @@ namespace GWConquest TextAsset unitDatabase = Resources.Load("Database/Units"); LoadDatabase(unitDatabase, ZoneType.Ground); + TextAsset heroDatabase = Resources.Load("Database/Heroes"); + LoadHeroDatabase(heroDatabase); + GameManager.Instance.UnitClasses = classMap.Values.ToArray(); BoltLog.Info("All unit classes loaded."); } @@ -118,6 +121,7 @@ namespace GWConquest break; case "Air": unitClass.UnitType = UnitType.Air; + unitClass.CanGoToFlank = false; break; } } @@ -142,6 +146,89 @@ namespace GWConquest } } + private static void LoadHeroDatabase(TextAsset asset, char delimiter=',') + { + CSVFile csv = CSVFile.ParseCSV(asset.text, delimiter: delimiter); + for (int i = 0; i < csv.Length; i++) + { + try + { + var data = csv.GetEntry(i); + UnitClass unitClass = new UnitClass(); + + var heroName = data.GetString("Name"); + + BoltLog.Info("Parsing hero {0}", heroName); + + unitClass.ShortName = "Hero" + Util.RemoveSpecialCharacters(heroName); + unitClass.FullName = heroName; + + unitClass.CanBeBuilt = false; + + unitClass.UnitType = UnitType.Hero; + unitClass.ZoneType = ZoneType.Ground; + + HeroInfo heroInfo = new HeroInfo(); + + heroInfo.LeaderTitle = data.GetString("Title"); + heroInfo.Level = data.GetInt("Level"); + + var heroType = data.GetString("Role"); + + switch(heroType) + { + case "C": + heroInfo.HeroType = HeroType.GroundCommander; + break; + case "F": + heroInfo.HeroType = HeroType.SpaceCommander; + break; + case "C/F": + heroInfo.HeroType = HeroType.FullCommander; + break; + case "A": + heroInfo.HeroType = HeroType.Agent; + break; + } + + List abilities = new List(); + + var ability1Name = data.GetString("Ability 1 Name"); + if(!Util.IsStringEmpty(ability1Name)) + { + abilities.Add(new HeroAbility() { + AbilityName = ability1Name, + AbilityDescription = data.GetString("Ability 1 Description"), + IsActive = data.GetString("Ability 1 A/P") == "A" + }); + } + + var ability2Name = data.GetString("Ability 2 Name"); + if(!Util.IsStringEmpty(ability2Name)) + { + abilities.Add(new HeroAbility() { + AbilityName = ability2Name, + AbilityDescription = data.GetString("Ability 2 Description"), + IsActive = data.GetString("Ability 2 A/P") == "A" + }); + } + + heroInfo.Abilities = abilities.ToArray(); + + unitClass.heroInfo = heroInfo; + + unitClass.LoadTexture(); + + classMap.Add(unitClass.ShortName, unitClass); + } + catch(Exception ex) + { + BoltLog.Error("Could not parse hero"); + BoltLog.Exception(ex); + } + } + } + public static UnitClass FromName(string name) { if(classMap == null) @@ -204,6 +291,17 @@ namespace GWConquest public FactoryType FactoryType; + public bool CanBeBuilt = true; + + public bool IsHero + { + get => UnitType == UnitType.Hero; + } + + public HeroInfo heroInfo; + + public bool CanGoToFlank = true; + public string Description; private void LoadTexture() @@ -211,7 +309,8 @@ namespace GWConquest Sprite = Resources.Load("UnitIcons/" + ShortName); if(Sprite == null) { - Sprite = Resources.Load("UnitIcons/placeholder"); + string placeholder = IsHero ? "UnitIcons/HeroPlaceholder" : "UnitIcons/placeholder"; + Sprite = Resources.Load(placeholder); } } @@ -240,7 +339,8 @@ namespace GWConquest Infantry, Cannon, Vehicle, - Air + Air, + Hero } public enum WeaponType @@ -250,4 +350,30 @@ namespace GWConquest Heavy } + public enum HeroType + { + GroundCommander, + SpaceCommander, + FullCommander, + Agent + } + + [System.Serializable] + public class HeroInfo + { + public string LeaderTitle; + public int Level; + public HeroType HeroType; + + public HeroAbility[] Abilities; + } + + [System.Serializable] + public class HeroAbility + { + public string AbilityName; + public string AbilityDescription; + public bool IsActive; + } + } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/Util.cs b/Assets/GWConquest/Scripts/Util.cs index 8b7e433..24d605a 100644 --- a/Assets/GWConquest/Scripts/Util.cs +++ b/Assets/GWConquest/Scripts/Util.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; -using System.Linq; +using System.Text.RegularExpressions; namespace GWConquest { @@ -183,7 +183,37 @@ namespace GWConquest return str == null || str == ""; } - + public static string RemoveSpecialCharacters(string str) + { + return Regex.Replace(str, @"[^\w]", ""); + } + + public static string GetOrdinalString(int number) + { + string str = number.ToString(); + if(number >= 11 && number <= 13) + { + str += "th"; + } + else if(number % 10 == 1) + { + str += "st"; + } + else if(number % 10 == 2) + { + str += "nd"; + } + else if(number % 10 == 3) + { + str += "rd"; + } + else + { + str += "th"; + } + + return str; + } } diff --git a/Assets/GWConquest/Scripts/Zone.cs b/Assets/GWConquest/Scripts/Zone.cs index e9c4ca5..ebb1b62 100644 --- a/Assets/GWConquest/Scripts/Zone.cs +++ b/Assets/GWConquest/Scripts/Zone.cs @@ -33,6 +33,11 @@ namespace GWConquest private static Dictionary zoneDict = new Dictionary(); + public static IEnumerable AllZones + { + get => zoneDict.Values; + } + public static Zone GetFromId(int zoneId) { if(zoneId == -1) diff --git a/Assets/GWConquest/Textures/Icons/Logo Wyth2.png b/Assets/GWConquest/Textures/Icons/Logo Wyth2.png new file mode 100644 index 0000000..6f2baff Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Logo Wyth2.png differ diff --git a/Assets/GWConquest/Textures/Icons/Logo Wyth2.png.meta b/Assets/GWConquest/Textures/Icons/Logo Wyth2.png.meta new file mode 100644 index 0000000..f552486 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Logo Wyth2.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 6504d938d9c4bb845a57b23e1fecfed7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + 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: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + 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/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index 5a431ab..1c4df8d 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 605abdc..8440c1f 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 9d24c28..d00392e 100644 --- a/Assets/Photon/PhotonBolt/project.json +++ b/Assets/Photon/PhotonBolt/project.json @@ -125,6 +125,58 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "HeroUnit", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeEntity, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "SubFormations", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeProtocolToken, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "FormationName", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeString, bolt.compiler", + "MaxLength": 1 + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "PacketMaxBits": 512, @@ -342,13 +394,14 @@ } }, { - "Name": "PlayerColor", + "Name": "FactionIndex", "Enabled": true, "Expanded": true, "ReplicationMode": 1, "Priority": 1, "PropertyType": { - "$type": "Bolt.Compiler.PropertyTypeColor, bolt.compiler" + "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler", + "MaxValue": 255 }, "AssetSettings": { "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", @@ -1598,13 +1651,14 @@ } }, { - "Name": "ControllingPlayer", + "Name": "ControllingPlayerId", "Enabled": true, "Expanded": true, "ReplicationMode": 1, "Priority": 1, "PropertyType": { - "$type": "Bolt.Compiler.PropertyTypeEntity, bolt.compiler" + "$type": "Bolt.Compiler.PropertyTypeInteger, bolt.compiler", + "MaxValue": 255 }, "AssetSettings": { "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", @@ -1728,6 +1782,40 @@ "Name": "DistrictState", "Guid": "593f7749-42a7-44fa-b61f-4bec598bae21", "Groups": [] + }, + { + "$type": "Bolt.Compiler.EventDefinition, bolt.compiler", + "Properties": [ + { + "Name": "Formation", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeEntity, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyEventSettings, bolt.compiler" + } + }, + { + "Name": "Unit", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeEntity, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyEventSettings, bolt.compiler" + } + } + ], + "Name": "AssignLeaderEvent", + "Guid": "19182fa7-e061-484b-8714-d5ddbdb8014b", + "Groups": [] } ], "ActiveGroup": "Everything"