Post Jam updates (Fullscreen, Demo Mode, Calm the AI down)
This commit is contained in:
parent
95579bcc3e
commit
1c0607804f
17 changed files with 913 additions and 26 deletions
|
|
@ -8782,8 +8782,8 @@ RectTransform:
|
|||
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: 98.7, y: -48.3}
|
||||
m_SizeDelta: {x: 33.55, y: 32.36}
|
||||
m_AnchoredPosition: {x: 58, y: -48.3}
|
||||
m_SizeDelta: {x: 38.67, y: 32.36}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &565950779861049767
|
||||
CanvasRenderer:
|
||||
|
|
@ -8811,7 +8811,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 8f8cf9388c6bebf4da648cb603b32d49, type: 3}
|
||||
m_Sprite: {fileID: 8214095464950831658, guid: 8fcdefe117c22b0418ec8c587a2b7601,
|
||||
type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -8876,8 +8877,8 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 5f22fd919e31ff14f816d4ac2ac5b136, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Unmuted: {fileID: 21300000, guid: 8f8cf9388c6bebf4da648cb603b32d49, type: 3}
|
||||
Muted: {fileID: 21300000, guid: 447378b52f1cc68408835ecc08470b9a, type: 3}
|
||||
Unmuted: {fileID: 8214095464950831658, guid: 8fcdefe117c22b0418ec8c587a2b7601, type: 3}
|
||||
Muted: {fileID: -1642888619156654608, guid: 0bfd909715d8ed343a18a1e0d0eaef05, type: 3}
|
||||
MutesMusic: 0
|
||||
--- !u!1 &1736330633559397463
|
||||
GameObject:
|
||||
|
|
@ -14930,6 +14931,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2042074775933466380}
|
||||
- {fileID: 4901449696098702457}
|
||||
- {fileID: 2999342363478846092}
|
||||
m_Father: {fileID: 299606013}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -14974,8 +14976,8 @@ RectTransform:
|
|||
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: 56.870075, y: -48.299988}
|
||||
m_SizeDelta: {x: 33.55, y: 32.36}
|
||||
m_AnchoredPosition: {x: 22.13003, y: -48.299988}
|
||||
m_SizeDelta: {x: 38.67, y: 32.36}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9169607402770690341
|
||||
CanvasRenderer:
|
||||
|
|
@ -15003,7 +15005,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: e4683db7ee00da245b033812e6fdf9ac, type: 3}
|
||||
m_Sprite: {fileID: -2667601937048796137, guid: 8fcdefe117c22b0418ec8c587a2b7601,
|
||||
type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -15068,8 +15071,9 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 5f22fd919e31ff14f816d4ac2ac5b136, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Unmuted: {fileID: 21300000, guid: e4683db7ee00da245b033812e6fdf9ac, type: 3}
|
||||
Muted: {fileID: 21300000, guid: 076a3878e0340bb41b97b9fe97771926, type: 3}
|
||||
Unmuted: {fileID: -2667601937048796137, guid: 8fcdefe117c22b0418ec8c587a2b7601,
|
||||
type: 3}
|
||||
Muted: {fileID: -6376664015803450011, guid: 0bfd909715d8ed343a18a1e0d0eaef05, type: 3}
|
||||
MutesMusic: 1
|
||||
--- !u!1 &5157846481027845323
|
||||
GameObject:
|
||||
|
|
@ -15394,6 +15398,140 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
option: 2
|
||||
--- !u!1 &5642264247351026407
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2999342363478846092}
|
||||
- component: {fileID: 2471831850338812620}
|
||||
- component: {fileID: 6941949088981380326}
|
||||
- component: {fileID: 6213111896319588144}
|
||||
- component: {fileID: 4909875804616707824}
|
||||
m_Layer: 5
|
||||
m_Name: ToggleFullscreen
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2999342363478846092
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5642264247351026407}
|
||||
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: 5243465428818291131}
|
||||
m_RootOrder: 2
|
||||
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: 95.94, y: -48.299988}
|
||||
m_SizeDelta: {x: 38.67, y: 32.36}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2471831850338812620
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5642264247351026407}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6941949088981380326
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5642264247351026407}
|
||||
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_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 3330059195138927908, guid: 8fcdefe117c22b0418ec8c587a2b7601,
|
||||
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!114 &6213111896319588144
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5642264247351026407}
|
||||
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: 1
|
||||
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: 6941949088981380326}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &4909875804616707824
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5642264247351026407}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bd8ec73c712204645877689af899e16f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Fullscreen: {fileID: 3330059195138927908, guid: 8fcdefe117c22b0418ec8c587a2b7601,
|
||||
type: 3}
|
||||
Window: {fileID: 465436041436826799, guid: 0bfd909715d8ed343a18a1e0d0eaef05, type: 3}
|
||||
--- !u!1 &5873550528272711806
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -109,6 +109,8 @@ public class GameTransition : MonoBehaviour {
|
|||
private bool prevState;
|
||||
private bool curState;
|
||||
|
||||
public float timeSinceInputOnRoot = 0f;
|
||||
|
||||
private void Update() {
|
||||
|
||||
// obscure fix to input field + esc
|
||||
|
|
@ -148,7 +150,21 @@ public class GameTransition : MonoBehaviour {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (state == GameState.Menu) {
|
||||
timeSinceInputOnRoot += Time.deltaTime;
|
||||
|
||||
if (timeSinceInputOnRoot > 15) {
|
||||
//state = GameState.SinglePlayer;
|
||||
GameBoardInstance.instance.SetupGame(true);
|
||||
Debug.Log("Starting Demo");
|
||||
timeSinceInputOnRoot = 0;
|
||||
}
|
||||
} else {
|
||||
timeSinceInputOnRoot = 0f;
|
||||
}
|
||||
|
||||
if (Input.anyKey)
|
||||
timeSinceInputOnRoot = 0f;
|
||||
|
||||
// transform
|
||||
var dist = Time.deltaTime * lerpSpeed;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue