diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index e1003b1..51ff25d 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -27365,12 +27365,7 @@ MonoBehaviour: - {fileID: 1821819294} - {fileID: 303737094} - {fileID: 1946153125} - IsAI: 1 - - FactionColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} - FactionName: Rebels - FactionLogo: {fileID: 21300000, guid: 00e5899d4e6e5a043a58bc84abb91edd, type: 3} - StartingPlanets: [] - IsAI: 1 + IsAI: 0 - FactionColor: {r: 0.53900003, g: 0.53900003, b: 0.53900003, a: 1} FactionName: Rokurant FactionLogo: {fileID: 21300000, guid: 74e6545f20e2b3542aa99da49316ce28, type: 3} @@ -28787,6 +28782,7 @@ MonoBehaviour: ShipyardRating: 0 GroundTransitionLengthFactor: 30 SpaceTransitionLengthFactor: 1 + BetweenTransitionLengthFactor: 10 BattleTurnLength: 30 BattleTurnDeviation: 10 MoveToFlankCooldown: 15 @@ -42205,6 +42201,9 @@ GameObject: - component: {fileID: 692834492} - component: {fileID: 692834491} - component: {fileID: 692834490} + - component: {fileID: 692834495} + - component: {fileID: 692834494} + - component: {fileID: 692834493} m_Layer: 0 m_Name: GameObject m_TagString: Untagged @@ -42228,6 +42227,7 @@ MonoBehaviour: unitCount: 10 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42244,6 +42244,7 @@ MonoBehaviour: unitCount: 6 playerId: 1 zone: {fileID: 781120733} + assignAsLeader: 0 --- !u!114 &692834481 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42260,6 +42261,7 @@ MonoBehaviour: unitCount: 5 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834482 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42276,6 +42278,7 @@ MonoBehaviour: unitCount: 1 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 1 --- !u!114 &692834483 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42292,6 +42295,7 @@ MonoBehaviour: unitCount: 1 playerId: 0 zone: {fileID: 801858043} + assignAsLeader: 1 --- !u!114 &692834484 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42308,6 +42312,7 @@ MonoBehaviour: unitCount: 1 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834485 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42324,6 +42329,7 @@ MonoBehaviour: unitCount: 2 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834486 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42340,6 +42346,7 @@ MonoBehaviour: unitCount: 6 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!4 &692834487 Transform: m_ObjectHideFlags: 0 @@ -42370,6 +42377,7 @@ MonoBehaviour: unitCount: 10 playerId: 1 zone: {fileID: 781120733} + assignAsLeader: 0 --- !u!114 &692834489 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42386,6 +42394,7 @@ MonoBehaviour: unitCount: 8 playerId: 1 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42402,6 +42411,7 @@ MonoBehaviour: unitCount: 3 playerId: 0 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42418,6 +42428,7 @@ MonoBehaviour: unitCount: 4 playerId: 0 zone: {fileID: 801858043} + assignAsLeader: 0 --- !u!114 &692834492 MonoBehaviour: m_ObjectHideFlags: 0 @@ -42434,6 +42445,58 @@ MonoBehaviour: unitCount: 8 playerId: 0 zone: {fileID: 801858043} + assignAsLeader: 0 +--- !u!114 &692834493 +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: Dreadnaught + unitCount: 1 + playerId: 0 + zone: {fileID: 781120733} + assignAsLeader: 0 +--- !u!114 &692834494 +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: StrikeCraft + unitCount: 10 + playerId: 0 + zone: {fileID: 781120733} + assignAsLeader: 0 +--- !u!114 &692834495 +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: Frigate + unitCount: 6 + playerId: 0 + zone: {fileID: 781120733} + assignAsLeader: 0 --- !u!1001 &693605575 PrefabInstance: m_ObjectHideFlags: 0 @@ -88276,7 +88339,7 @@ PrefabInstance: - target: {fileID: 426511785042915064, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} propertyPath: m_Color.a - value: 0.105882354 + value: 0.050980393 objectReference: {fileID: 0} - target: {fileID: 426511785042915064, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} @@ -88286,12 +88349,12 @@ PrefabInstance: - target: {fileID: 426511785042915064, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} propertyPath: m_Color.g - value: 0.7294118 + value: 1 objectReference: {fileID: 0} - target: {fileID: 426511785042915064, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} propertyPath: m_Color.b - value: 0.49411765 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5098898884174982901, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} @@ -88303,6 +88366,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6109372026020611718, guid: 52ceb6607c69a284bbaf944247e5e802, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7524051847518656828, guid: 52ceb6607c69a284bbaf944247e5e802, type: 3} propertyPath: m_Color.a @@ -124899,8 +124967,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Battle: {fileID: 0} + BattleNameText: {fileID: 834739464} PlayerPanel: {fileID: 77748481770314010} EnemyPanel: {fileID: 1003682761} + PlayerFactionLogo: {fileID: 1383543978} + PlayerFactionText: {fileID: 1517110526} + EnemyFactionLogo: {fileID: 571739762} + EnemyFactionText: {fileID: 1347825781} FlankPanel: {fileID: 853420528} FlankUIPrefab: {fileID: 4081925067141291286, guid: 2b9452b3918dbac4dba70a0ee84d8ab4, type: 3} @@ -124911,6 +124984,8 @@ MonoBehaviour: RightSwitchArrow: {fileID: 168624194} PlayerStrengthBar: {fileID: 644832078} EnemyStrengthBar: {fileID: 304071185} + PlayerMoraleBar: {fileID: 54581869} + EnemyMoraleBar: {fileID: 1861816391} ShotEffectPrefab: {fileID: 2369817560459136989, guid: b9f3cdc2345736842b2d77863c93066f, type: 3} MGShotPrefab: {fileID: 2369817560459136989, guid: 3ab4f83469374724fb6507ed35bfce20, diff --git a/Assets/GWConquest/Scenes/MainMenu.unity b/Assets/GWConquest/Scenes/MainMenu.unity index df9f579..2884804 100644 --- a/Assets/GWConquest/Scenes/MainMenu.unity +++ b/Assets/GWConquest/Scenes/MainMenu.unity @@ -287,9 +287,20 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 804547815} - m_MethodName: StartServer - m_Mode: 1 + - m_Target: {fileID: 1007239703} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 832321101} + m_MethodName: SetActive + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -622,6 +633,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 404644152} m_CullTransparentMesh: 0 +--- !u!1 &409818664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 409818665} + - component: {fileID: 409818667} + - component: {fileID: 409818666} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &409818665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 409818664} + 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: 580240451} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -125, y: -66} + m_SizeDelta: {x: 110, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &409818666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 409818664} + 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.8, g: 0.25490198, b: 0.14509805, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6504d938d9c4bb845a57b23e1fecfed7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &409818667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 409818664} + m_CullTransparentMesh: 0 --- !u!1 &410985473 GameObject: m_ObjectHideFlags: 0 @@ -859,6 +944,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 427024749} m_CullTransparentMesh: 0 +--- !u!1 &464323988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464323989} + - component: {fileID: 464323991} + - component: {fileID: 464323990} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &464323989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464323988} + 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: 1826293084} + 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: -24.399963} + m_SizeDelta: {x: 0, y: -94.4082} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &464323990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464323988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 34f28408878a4b84383269643d6d30e2, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &464323991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464323988} + m_CullTransparentMesh: 0 --- !u!1 &525377643 GameObject: m_ObjectHideFlags: 0 @@ -939,6 +1098,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 525377643} m_CullTransparentMesh: 0 +--- !u!1 &580240450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580240451} + - component: {fileID: 580240452} + - component: {fileID: 580240453} + m_Layer: 5 + m_Name: Wythler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &580240451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580240450} + 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: 622908634} + - {fileID: 409818665} + - {fileID: 1136387140} + m_Father: {fileID: 1110655551} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -35.86238} + m_SizeDelta: {x: -40, y: -111.72476} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &580240452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580240450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 342dd2fd557feed438ce05e1625dee09, type: 3} + m_Name: + m_EditorClassIdentifier: + smoothTime: 0.1 + scaleFactor: 1.02 +--- !u!114 &580240453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580240450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 804547815} + m_MethodName: StartServer + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &603243857 GameObject: m_ObjectHideFlags: 0 @@ -1053,7 +1320,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -4, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &652941607 +--- !u!1 &622908633 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1061,75 +1328,231 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 652941608} - - component: {fileID: 652941611} - - component: {fileID: 652941610} - - component: {fileID: 652941609} + - component: {fileID: 622908634} + - component: {fileID: 622908636} + - component: {fileID: 622908635} m_Layer: 5 - m_Name: Viewport + m_Name: Text (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &652941608 +--- !u!224 &622908634 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652941607} + m_GameObject: {fileID: 622908633} 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: 2146634127} - m_Father: {fileID: 410985474} + m_Children: [] + m_Father: {fileID: 580240451} 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: -4, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &652941609 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652941607} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &652941610 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 89, y: -6} + m_SizeDelta: {x: 268.885, y: 120} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &622908635 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652941607} + m_GameObject: {fileID: 622908633} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + 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_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 29 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Wythler Dominion +--- !u!222 &622908636 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622908633} + m_CullTransparentMesh: 0 +--- !u!1 &627885474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627885475} + - component: {fileID: 627885477} + - component: {fileID: 627885476} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &627885475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627885474} + 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: 1826293084} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -89, y: -6} + m_SizeDelta: {x: 268.885, y: 120} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &627885476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627885474} + 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: 0.8901961, b: 0.5647059, 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: 29 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Republic Remnants +--- !u!222 &627885477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627885474} + m_CullTransparentMesh: 0 +--- !u!1 &652941607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 652941608} + - component: {fileID: 652941611} + - component: {fileID: 652941610} + - component: {fileID: 652941609} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &652941608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652941607} + 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: 2146634127} + m_Father: {fileID: 410985474} + 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: -4, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &652941609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652941607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &652941610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652941607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 @@ -1536,7 +1959,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1.5 + m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 @@ -1578,6 +2001,7 @@ RectTransform: m_Children: - {fileID: 832321102} - {fileID: 736075749} + - {fileID: 1007239704} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1598,6 +2022,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b0644e82c0e87f4294cd57728a2c5af, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &817540361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817540362} + - component: {fileID: 817540364} + - component: {fileID: 817540363} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &817540362 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817540361} + 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: 1826293084} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 125, y: -66} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &817540363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817540361} + 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: 0.8901961, b: 0.5647059, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 43c0c67fc0299df49ad542b1d669f483, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &817540364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817540361} + m_CullTransparentMesh: 0 --- !u!1 &832321101 GameObject: m_ObjectHideFlags: 0 @@ -2200,6 +2698,57 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 974203479} m_PrefabAsset: {fileID: 0} +--- !u!1 &1007239703 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1007239704} + - component: {fileID: 1007239705} + m_Layer: 5 + m_Name: SelectFactionMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1007239704 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007239703} + 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: 1110655551} + m_Father: {fileID: 804547814} + 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: -915.5, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1007239705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007239703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 3 + m_AspectRatio: 1.3 --- !u!1 &1009557740 GameObject: m_ObjectHideFlags: 0 @@ -2434,13 +2983,212 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1205396547 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4753615581571865167, guid: 8aa2cb0adc4493742807eb1d0417d25a, - type: 3} - m_PrefabInstance: {fileID: 4753615581548042217} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} +--- !u!1001 &1110655550 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1007239704} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: GuiPanel + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.x + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &1110655551 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1110655550} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1136387139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1136387140} + - component: {fileID: 1136387142} + - component: {fileID: 1136387141} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1136387140 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136387139} + 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: 580240451} + 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: -24.399963} + m_SizeDelta: {x: 0, y: -94.4082} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1136387141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136387139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 47f65de531b48934cbc06fc3ee6f8a93, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1136387142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136387139} + m_CullTransparentMesh: 0 +--- !u!114 &1205396547 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4753615581571865167, guid: 8aa2cb0adc4493742807eb1d0417d25a, + type: 3} + m_PrefabInstance: {fileID: 4753615581548042217} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} @@ -3043,6 +3791,84 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1616179307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1616179308} + - component: {fileID: 1616179310} + - component: {fileID: 1616179309} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1616179308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616179307} + 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: 1110655551} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -45} + m_SizeDelta: {x: 468.87305, y: 43.263016} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1616179309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616179307} + 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: SELECT A FACTION +--- !u!222 &1616179310 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1616179307} + m_CullTransparentMesh: 0 --- !u!1 &1758790513 GameObject: m_ObjectHideFlags: 0 @@ -3123,6 +3949,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758790513} m_CullTransparentMesh: 0 +--- !u!1 &1826293083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1826293084} + - component: {fileID: 1826293085} + - component: {fileID: 1826293086} + m_Layer: 5 + m_Name: Republic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1826293084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826293083} + 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: 627885475} + - {fileID: 817540362} + - {fileID: 464323989} + m_Father: {fileID: 1110655551} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -35.86238} + m_SizeDelta: {x: -40, y: -111.72476} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1826293085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826293083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 342dd2fd557feed438ce05e1625dee09, type: 3} + m_Name: + m_EditorClassIdentifier: + smoothTime: 0.1 + scaleFactor: 1.02 +--- !u!114 &1826293086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826293083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 804547815} + m_MethodName: StartServer + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1856692578 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs index fa45d91..89d26f9 100644 --- a/Assets/GWConquest/Scripts/Formation.cs +++ b/Assets/GWConquest/Scripts/Formation.cs @@ -190,8 +190,28 @@ namespace GWConquest state.CurrentTransition.OriginZone = Zone.GetZoneId(currentZone); state.CurrentTransition.TargetZone = Zone.GetZoneId(target); - bool isGroundTransition = target.zoneType == ZoneType.Ground; - float lengthFactor = isGroundTransition ? GameManager.Instance.GroundTransitionLengthFactor : GameManager.Instance.SpaceTransitionLengthFactor; + bool isGroundTransition = target.zoneType == ZoneType.Ground || currentZone.zoneType == ZoneType.Ground; + //float lengthFactor = isGroundTransition ? GameManager.Instance.GroundTransitionLengthFactor : GameManager.Instance.SpaceTransitionLengthFactor; + float lengthFactor; + if(currentZone.zoneType == ZoneType.Ground) + { + if(target.zoneType == ZoneType.Ground) + { + lengthFactor = GameManager.Instance.GroundTransitionLengthFactor; + } + else { + lengthFactor = GameManager.Instance.BetweenTransitionLengthFactor; + } + } + else { + if(target.zoneType == ZoneType.Ground) + { + lengthFactor = GameManager.Instance.BetweenTransitionLengthFactor; + } + else { + lengthFactor = GameManager.Instance.SpaceTransitionLengthFactor; + } + } state.CurrentTransition.TransitionLength = Vector3.Distance(currentZone.transform.position, target.transform.position) * lengthFactor; state.CurrentTransition.IsCurved = isGroundTransition; @@ -344,8 +364,8 @@ namespace GWConquest Vector3 oldPos = transform.position; Vector3 newPos; Quaternion newRot; - if(state.CurrentTransition.IsCurved) - { + //if(state.CurrentTransition.IsCurved) + //{ Vector3 planetPos = targetZone.planet.transform.position; Vector3 originPos = originZone.transform.position - planetPos; @@ -354,14 +374,14 @@ namespace GWConquest animDistanceCovered / state.CurrentTransition.TransitionLength); newPos += planetPos; newRot = Quaternion.LookRotation(newPos - oldPos, newPos - planetPos); - } - else - { + //} + //else + //{ newPos = Vector3.Lerp(originZone.transform.position, targetZone.transform.position, animDistanceCovered / state.CurrentTransition.TransitionLength); newRot = Quaternion.LookRotation(newPos - oldPos, Vector3.up); - } + //} transform.position = newPos; transform.rotation = newRot; diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 2dcdfbe..22292c7 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -4,6 +4,8 @@ namespace GWConquest { public class GameManager : MonoBehaviour { + public static int HostFactionIndex = 0; + public Faction[] Factions; public UnitClass[] UnitClasses; @@ -11,6 +13,7 @@ namespace GWConquest public float GroundTransitionLengthFactor; public float SpaceTransitionLengthFactor; + public float BetweenTransitionLengthFactor; public float BattleTurnLength; public float BattleTurnDeviation; diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs index c86af01..d0e487d 100644 --- a/Assets/GWConquest/Scripts/ServerCallbacks.cs +++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs @@ -13,7 +13,7 @@ namespace GWConquest Debug.Log("Player entity instantiated"); IPlayerState playerState = playerEntity.GetState(); playerState.IsHost = true; - playerState.FactionIndex = 0; + playerState.FactionIndex = GameManager.HostFactionIndex; playerEntity.GetComponent().AssignStartingPlanets(); playerEntity.TakeControl(); @@ -28,7 +28,7 @@ namespace GWConquest IPlayerState playerState = playerEntity.GetState(); playerState.ConnectionId = (int)connection.ConnectionId; playerState.IsHost = false; - playerState.FactionIndex = 1; + playerState.FactionIndex = (GameManager.HostFactionIndex + 1) % 2; playerEntity.GetComponent().AssignStartingPlanets(); playerEntity.AssignControl(connection); } diff --git a/Assets/GWConquest/Scripts/SpawnAIUnits.cs b/Assets/GWConquest/Scripts/SpawnAIUnits.cs index 0352629..46fec24 100644 --- a/Assets/GWConquest/Scripts/SpawnAIUnits.cs +++ b/Assets/GWConquest/Scripts/SpawnAIUnits.cs @@ -10,6 +10,7 @@ namespace GWConquest { public int unitCount; public int playerId; public Zone zone; + public bool assignAsLeader; public void OnSceneLoadLocalDone() { @@ -20,7 +21,11 @@ namespace GWConquest { { for(int i = 0; i < unitCount; i++) { - Unit.SpawnUnit(zone, UnitClass.FromName(unitName), player); + var unit = Unit.SpawnUnit(zone, UnitClass.FromName(unitName), player); + if(assignAsLeader) + { + unit.Formation.HeroUnit = unit; + } } } } diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs index 0c66ac4..61a1469 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs @@ -1,15 +1,23 @@ using UnityEngine; using UnityEngine.UI; using System.Linq; +using System.Collections.Generic; namespace GWConquest { public class BattleUI : MonoBehaviour { public Battle Battle; + public Text BattleNameText; + public BattleArmyPanel PlayerPanel; public BattleArmyPanel EnemyPanel; + public Image PlayerFactionLogo; + public Text PlayerFactionText; + public Image EnemyFactionLogo; + public Text EnemyFactionText; + public RectTransform FlankPanel; public GameObject FlankUIPrefab; public BattleFlankUI[] FlankUIs; @@ -24,6 +32,9 @@ namespace GWConquest { public RectTransform PlayerStrengthBar; public RectTransform EnemyStrengthBar; + public RectTransform PlayerMoraleBar; + public RectTransform EnemyMoraleBar; + public GameObject ShotEffectPrefab; public GameObject MGShotPrefab; public GameObject HeavyShotPrefab; @@ -173,7 +184,8 @@ namespace GWConquest { UpdateIcons(); } - private void FixedUpdate() { + private void FixedUpdate() { + var planet = Battle.Zone.planet; var battleCount = planet.GetAllBattles().Count(); @@ -187,9 +199,20 @@ namespace GWConquest { RightSwitchArrow.SetActive(false); } + BattleNameText.text = "First Battle of " + planet.planetName; + var formations = Battle.Zone.Formations; - float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f); - float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f); + + var strengths = formations.GroupBy(f => f.Player, (p, fs) => new { + Player = p, + Strength = fs.Sum(f => f.GetFormationStrength()) + } ); + + float playerStrength = strengths.Where(s => s.Player == Player.CurrentPlayer).Sum(s => s.Strength); + float enemyStrength = strengths.Where(s => s.Player != Player.CurrentPlayer).Sum(s => s.Strength); + + //float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f); + //float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f); float fullStrength = playerStrength + enemyStrength; @@ -203,6 +226,33 @@ namespace GWConquest { PlayerStrengthBar.anchorMax = new Vector2(playerStrength, 1f); EnemyStrengthBar.anchorMin = new Vector2(playerStrength, 0f); + + Player currentPlayer = Player.CurrentPlayer; + Player enemyPlayer = strengths.Where(s => s.Player != Player.CurrentPlayer).ArgMax(s => s.Strength).Player; + + if(currentPlayer != null) + { + var playerStrengthBarImage = PlayerStrengthBar.GetComponent(); + playerStrengthBarImage.color = Util.UpdateColorRGB(playerStrengthBarImage.color, currentPlayer.Faction.FactionColor); + var playerMoraleBarImage = PlayerMoraleBar.GetComponent(); + playerMoraleBarImage.color = Util.UpdateColorRGB(playerMoraleBarImage.color, currentPlayer.Faction.FactionColor); + PlayerFactionLogo.sprite = currentPlayer.Faction.FactionLogo; + PlayerFactionText.text = currentPlayer.Faction.FactionName; + PlayerFactionText.color = Util.UpdateColorRGB(PlayerFactionText.color, currentPlayer.Faction.FactionColor); + } + + if(enemyPlayer != null) + { + var enemyStrengthBarImage = EnemyStrengthBar.GetComponent(); + enemyStrengthBarImage.color = Util.UpdateColorRGB(enemyStrengthBarImage.color, enemyPlayer.Faction.FactionColor); + var enemyMoraleBarImage = EnemyMoraleBar.GetComponent(); + enemyMoraleBarImage.color = Util.UpdateColorRGB(enemyStrengthBarImage.color, enemyPlayer.Faction.FactionColor); + EnemyFactionLogo.sprite = enemyPlayer.Faction.FactionLogo; + EnemyFactionText.text = enemyPlayer.Faction.FactionName; + EnemyFactionText.color = Util.UpdateColorRGB(EnemyFactionText.color, enemyPlayer.Faction.FactionColor); + } + + } public void SelectIconOnFlank(BattleUnitIcon icon) diff --git a/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs b/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs new file mode 100644 index 0000000..7300a3a --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using UnityEngine.EventSystems; + +namespace GWConquest { + + public class HoverHighlightScale : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { + + public float smoothTime = 0.1f; + public float scaleFactor = 1.1f; + + private Vector3 origScale; + private Vector3 currentVelocity = Vector3.zero; + + private bool isHighlighted = false; + + private void Start() { + origScale = transform.localScale; + } + + private void Update() { + var target = isHighlighted ? origScale * scaleFactor : origScale; + transform.localScale = Vector3.SmoothDamp(transform.localScale, target, ref currentVelocity, smoothTime); + } + + public void OnPointerEnter(PointerEventData ev) + { + isHighlighted = true; + } + + public void OnPointerExit(PointerEventData ev) + { + isHighlighted = false; + } + } +} diff --git a/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs.meta b/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs.meta new file mode 100644 index 0000000..3a96dd2 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/HoverHighlightScale.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 342dd2fd557feed438ce05e1625dee09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/MainMenu.cs b/Assets/GWConquest/Scripts/UI/MainMenu.cs index 1f6169f..9509895 100644 --- a/Assets/GWConquest/Scripts/UI/MainMenu.cs +++ b/Assets/GWConquest/Scripts/UI/MainMenu.cs @@ -11,8 +11,9 @@ namespace GWConquest GameOptions.ApplyOptions(); } - public void StartServer() + public void StartServer(int hostFactionIndex) { + GameManager.HostFactionIndex = hostFactionIndex; BoltLauncher.StartServer(); } diff --git a/Assets/GWConquest/Scripts/Util.cs b/Assets/GWConquest/Scripts/Util.cs index 61b7d3c..870f0f6 100644 --- a/Assets/GWConquest/Scripts/Util.cs +++ b/Assets/GWConquest/Scripts/Util.cs @@ -178,6 +178,23 @@ namespace GWConquest return minArg; } + public static T ArgMax(this IEnumerable dict, Func selector) + { + float maxValue = float.MinValue; + T maxArg = default; + + foreach(var entry in dict) + { + float val = selector(entry); + if(val >= maxValue) + { + maxValue = val; + maxArg = entry; + } + } + return maxArg; + } + public static bool IsStringEmpty(string str) { return str == null || str == ""; diff --git a/Assets/GWConquest/Textures/Art.meta b/Assets/GWConquest/Textures/Art.meta new file mode 100644 index 0000000..dddb856 --- /dev/null +++ b/Assets/GWConquest/Textures/Art.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9e658a951489fe4bb83ac8ab0695236 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Art/Remnant Final.png b/Assets/GWConquest/Textures/Art/Remnant Final.png new file mode 100644 index 0000000..b07f4d6 Binary files /dev/null and b/Assets/GWConquest/Textures/Art/Remnant Final.png differ diff --git a/Assets/GWConquest/Textures/Art/Remnant Final.png.meta b/Assets/GWConquest/Textures/Art/Remnant Final.png.meta new file mode 100644 index 0000000..3e8d0ab --- /dev/null +++ b/Assets/GWConquest/Textures/Art/Remnant Final.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 34f28408878a4b84383269643d6d30e2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + 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/Textures/Art/Rokurant Final.png b/Assets/GWConquest/Textures/Art/Rokurant Final.png new file mode 100644 index 0000000..0b3928a Binary files /dev/null and b/Assets/GWConquest/Textures/Art/Rokurant Final.png differ diff --git a/Assets/GWConquest/Textures/Art/Rokurant Final.png.meta b/Assets/GWConquest/Textures/Art/Rokurant Final.png.meta new file mode 100644 index 0000000..2336580 --- /dev/null +++ b/Assets/GWConquest/Textures/Art/Rokurant Final.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 47f65de531b48934cbc06fc3ee6f8a93 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + 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: