timers for start and end game
continue screen probably working
This commit is contained in:
parent
77c597498f
commit
ea93620755
|
@ -159,7 +159,7 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
if (HighestStack(board) >= 13) {
|
if (HighestStack(board) >= 13) {
|
||||||
delayState = DelayState.Loss;
|
delayState = DelayState.Loss;
|
||||||
|
|
||||||
StartCoroutine(HandleLoss());
|
StartCoroutine(HandleLoss(3f));
|
||||||
// TODO - Do a bunch of networking silliness to end the game here
|
// TODO - Do a bunch of networking silliness to end the game here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,10 +177,14 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw the big collapse of pieces after a few seconds
|
// Draw the big collapse of pieces after a few seconds
|
||||||
IEnumerator HandleLoss() {
|
IEnumerator HandleLoss(float timer) {
|
||||||
|
if (board == null) yield break;
|
||||||
|
|
||||||
// Wait three seconds before doing the crumble so they can watch in dismay
|
// Wait three seconds before doing the crumble so they can watch in dismay
|
||||||
// at the piles of trash that killed them
|
// at the piles of trash that killed them
|
||||||
yield return new WaitForSeconds(3f);
|
active = false;
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(timer);
|
||||||
// First, crumble the board to be really cool
|
// First, crumble the board to be really cool
|
||||||
for(int x = 0; x < board.Count; ++x) {
|
for(int x = 0; x < board.Count; ++x) {
|
||||||
var col = board[x];
|
var col = board[x];
|
||||||
|
@ -191,6 +195,8 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
|
|
||||||
// Now, re-initialize the board, so those falling pieces are the last of our board
|
// Now, re-initialize the board, so those falling pieces are the last of our board
|
||||||
board = BoardStateExtension.Initialize();
|
board = BoardStateExtension.Initialize();
|
||||||
|
render.RebuildStack(board);
|
||||||
|
render.Render(board);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -635,7 +641,9 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
if (isMine) {
|
if (isMine) {
|
||||||
//checkDirty();
|
//checkDirty();
|
||||||
|
|
||||||
|
render.RebuildStack(board);
|
||||||
GameLogic();
|
GameLogic();
|
||||||
|
render.RebuildStack(board);
|
||||||
|
|
||||||
if (Time.time >= nextNetworkTick && NetworkManager.inRoom){
|
if (Time.time >= nextNetworkTick && NetworkManager.inRoom){
|
||||||
UpdateNow();
|
UpdateNow();
|
||||||
|
@ -649,7 +657,8 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
// Seriously I can't believe this works this is dirty
|
// Seriously I can't believe this works this is dirty
|
||||||
|
|
||||||
// It does make it render twice as fast, I have idea
|
// It does make it render twice as fast, I have idea
|
||||||
render.Render(board);
|
// i fix by doing two rebuild stacks >:)
|
||||||
|
// render.Render(board);
|
||||||
|
|
||||||
render.SetComboLevel(Combo);
|
render.SetComboLevel(Combo);
|
||||||
render.SetScoreValue(score);
|
render.SetScoreValue(score);
|
||||||
|
@ -670,7 +679,7 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
public void Setup(){
|
public void Setup(){
|
||||||
board = BoardStateExtension.Initialize();
|
board = BoardStateExtension.Initialize();
|
||||||
|
|
||||||
StopAllCoroutines(); // Murder all coroutines :'D
|
StopAI();
|
||||||
// This is to reset the AI
|
// This is to reset the AI
|
||||||
|
|
||||||
// Build the list of possible placements the AI may use
|
// Build the list of possible placements the AI may use
|
||||||
|
@ -697,6 +706,15 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
active = true;
|
active = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Stop(){
|
||||||
|
StopAI();
|
||||||
|
active = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Clear(){
|
||||||
|
delayState = DelayState.None;
|
||||||
|
StartCoroutine(HandleLoss(0f));
|
||||||
|
}
|
||||||
|
|
||||||
public IEnumerable<TileInfo> Neighbors(int x, int y, BoardState bs) {
|
public IEnumerable<TileInfo> Neighbors(int x, int y, BoardState bs) {
|
||||||
var self = bs.tile(x, y);
|
var self = bs.tile(x, y);
|
||||||
|
@ -871,12 +889,20 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
|
||||||
StartAI();
|
StartAI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Coroutine aiThinkCoroutine;
|
||||||
|
|
||||||
public void StartAI(float thinkTime = 0.5f) {
|
public void StartAI(float thinkTime = 0.5f) {
|
||||||
AIEnabled = true;
|
AIEnabled = true;
|
||||||
AIMoveTime = thinkTime;
|
AIMoveTime = thinkTime;
|
||||||
StartCoroutine(AIThink());
|
aiThinkCoroutine = StartCoroutine(AIThink());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void StopAI(){
|
||||||
|
AIEnabled = false;
|
||||||
|
if (aiThinkCoroutine != null) StopCoroutine(aiThinkCoroutine);
|
||||||
|
aiThinkCoroutine = null;
|
||||||
|
}
|
||||||
|
|
||||||
public bool AIEnabled = false;
|
public bool AIEnabled = false;
|
||||||
public float AIMoveTime = 0.5f;
|
public float AIMoveTime = 0.5f;
|
||||||
IEnumerator AIThink() {
|
IEnumerator AIThink() {
|
||||||
|
|
|
@ -3,12 +3,20 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
|
using TMPro;
|
||||||
|
|
||||||
public class GameBoardInstance : MonoBehaviour {
|
public class GameBoardInstance : MonoBehaviour {
|
||||||
|
|
||||||
public static GameBoardInstance instance { get; private set; }
|
public static GameBoardInstance instance { get; private set; }
|
||||||
|
|
||||||
public GameBoard player1, player2;
|
public GameBoard player1, player2;
|
||||||
|
|
||||||
|
[Header("Text")]
|
||||||
|
public TextMeshProUGUI headerTextMesh;
|
||||||
|
public string startKey;
|
||||||
|
public string gameSetKey;
|
||||||
|
|
||||||
|
[Header("Referneces")]
|
||||||
public GameObject tilePrefab;
|
public GameObject tilePrefab;
|
||||||
public Sprite[] regular;
|
public Sprite[] regular;
|
||||||
public Sprite[] lit;
|
public Sprite[] lit;
|
||||||
|
@ -21,7 +29,64 @@ public class GameBoardInstance : MonoBehaviour {
|
||||||
instance = this;
|
instance = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Update() {
|
||||||
|
var state = GameTransition.Instance.state;
|
||||||
|
if (state == GameState.InGame && !endGameCoroutine){
|
||||||
|
var over = player1.delayState == GameBoard.DelayState.Loss || player2.delayState == GameBoard.DelayState.Loss;
|
||||||
|
|
||||||
|
if (over){
|
||||||
|
player1.Stop();
|
||||||
|
player2.Stop();
|
||||||
|
|
||||||
|
StartCoroutine(EndGameTimer(5f));
|
||||||
|
}
|
||||||
|
} else if (state == GameState.Continue){
|
||||||
|
var response = -1;
|
||||||
|
if (NetworkManager.inRoom){
|
||||||
|
response = PlayerProperties.GetAllResponse();
|
||||||
|
|
||||||
|
if (PlayerProperties.playerResponse.GetLocal() == 2){
|
||||||
|
response = 2;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
response = PlayerProperties.playerResponse.GetLocal();
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(response){
|
||||||
|
case 0:
|
||||||
|
SetupGame();
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
case -2:
|
||||||
|
GameTransition.Instance.state = GameState.Lobby;
|
||||||
|
player1.Clear();
|
||||||
|
player2.Clear();
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
if (NetworkManager.inRoom){
|
||||||
|
NetworkManager.net.OpLeaveRoom();
|
||||||
|
GameTransition.Instance.state = GameState.Multiplayer;
|
||||||
|
} else {
|
||||||
|
GameTransition.Instance.state = GameState.Menu;
|
||||||
|
}
|
||||||
|
player1.Clear();
|
||||||
|
player2.Clear();
|
||||||
|
break;
|
||||||
|
case -3:
|
||||||
|
GameTransition.Instance.state = GameState.Menu;
|
||||||
|
player1.Clear();
|
||||||
|
player2.Clear();
|
||||||
|
break;
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void SetupGame(){
|
public void SetupGame(){
|
||||||
|
System.Action callback;
|
||||||
|
|
||||||
|
player1.Clear();
|
||||||
|
player2.Clear();
|
||||||
|
|
||||||
if (NetworkManager.inRoom){
|
if (NetworkManager.inRoom){
|
||||||
var players = NetworkManager.net.CurrentRoom.Players.Values.OrderBy(p => p.ID);
|
var players = NetworkManager.net.CurrentRoom.Players.Values.OrderBy(p => p.ID);
|
||||||
|
@ -31,19 +96,57 @@ public class GameBoardInstance : MonoBehaviour {
|
||||||
player1.authorityID = p1.ID;
|
player1.authorityID = p1.ID;
|
||||||
player2.authorityID = p2.ID;
|
player2.authorityID = p2.ID;
|
||||||
|
|
||||||
player1.Setup();
|
callback = StartMultiPlayer;
|
||||||
player2.Setup();
|
|
||||||
} else {
|
} else {
|
||||||
player1.authorityID = -1;
|
player1.authorityID = -1;
|
||||||
player2.authorityID = -1;
|
player2.authorityID = -1;
|
||||||
|
|
||||||
player1.Setup();
|
callback = StartSinglePlayer;
|
||||||
player2.Setup();
|
|
||||||
|
|
||||||
player2.StartAI(new[] { 0.5f, 0.2f, 0.1f, 0f }[AIDifficulty]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GameTransition.Instance.state = GameState.InGame;
|
GameTransition.Instance.state = GameState.InGame;
|
||||||
|
StartCoroutine(StartGameTimer(3f, callback));
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator StartGameTimer(float timer, System.Action callback){
|
||||||
|
var t = Time.time;
|
||||||
|
while(Time.time - t <= timer){
|
||||||
|
headerTextMesh.text = Mathf.CeilToInt(timer - (Time.time - t)).ToString();
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
headerTextMesh.text = Localization.GetString(startKey);
|
||||||
|
|
||||||
|
PlayerProperties.CreatePlayerHashtable();
|
||||||
|
callback();
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(2f);
|
||||||
|
headerTextMesh.text = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool endGameCoroutine;
|
||||||
|
|
||||||
|
private IEnumerator EndGameTimer(float timer){
|
||||||
|
endGameCoroutine = true;
|
||||||
|
|
||||||
|
headerTextMesh.text = Localization.GetString(gameSetKey);
|
||||||
|
yield return new WaitForSeconds(timer);
|
||||||
|
headerTextMesh.text = "";
|
||||||
|
|
||||||
|
GameTransition.Instance.state = GameState.Continue;
|
||||||
|
Rematch.Instance.Setup();
|
||||||
|
|
||||||
|
endGameCoroutine = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartSinglePlayer(){
|
||||||
|
player1.Setup();
|
||||||
|
player2.Setup();
|
||||||
|
player2.StartAI(new[] { 0.5f, 0.2f, 0.1f, 0f }[AIDifficulty]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartMultiPlayer(){
|
||||||
|
player1.Setup();
|
||||||
|
player2.Setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,11 +95,18 @@ public class GameBoardRender : MonoBehaviour {
|
||||||
for (var i = 0; i < state.Count; ++i) {
|
for (var i = 0; i < state.Count; ++i) {
|
||||||
var root = basePoint.GetChild(i);
|
var root = basePoint.GetChild(i);
|
||||||
var t = state[i];
|
var t = state[i];
|
||||||
RebuildStack(root, t);
|
|
||||||
DrawStack(root, t);
|
DrawStack(root, t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void RebuildStack(BoardState state){
|
||||||
|
for (var i = 0; i < state.Count; ++i) {
|
||||||
|
var root = basePoint.GetChild(i);
|
||||||
|
var t = state[i];
|
||||||
|
RebuildStack(root, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void RenderName(){
|
public void RenderName(){
|
||||||
if (NetworkManager.inRoom && board.authorityID != -1){
|
if (NetworkManager.inRoom && board.authorityID != -1){
|
||||||
var player = NetworkManager.net.CurrentRoom.GetPlayer(board.authorityID);
|
var player = NetworkManager.net.CurrentRoom.GetPlayer(board.authorityID);
|
||||||
|
|
|
@ -3751,6 +3751,161 @@ MonoBehaviour:
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &2013137393
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2013137394}
|
||||||
|
- component: {fileID: 2013137396}
|
||||||
|
- component: {fileID: 2013137395}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Header
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2013137394
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2013137393}
|
||||||
|
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: 1736330635070797289}
|
||||||
|
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 &2013137396
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2013137393}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &2013137395
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2013137393}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2100000, guid: 05824678f4b6f7e42b844430d5408db0, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 0
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 0}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_outlineColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontSize: 108
|
||||||
|
m_fontSizeBase: 108
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 0
|
||||||
|
m_textAlignment: 4098
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_firstOverflowCharacterIndex: -1
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
m_isLinkedTextComponent: 0
|
||||||
|
m_isTextTruncated: 0
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_ignoreRectMaskCulling: 0
|
||||||
|
m_ignoreCulling: 1
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 1
|
||||||
|
m_firstVisibleCharacter: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_textInfo:
|
||||||
|
textComponent: {fileID: 2013137395}
|
||||||
|
characterCount: 0
|
||||||
|
spriteCount: 0
|
||||||
|
spaceCount: 0
|
||||||
|
wordCount: 0
|
||||||
|
linkCount: 0
|
||||||
|
lineCount: 0
|
||||||
|
pageCount: 0
|
||||||
|
materialCount: 1
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_spriteAnimator: {fileID: 0}
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_subTextObjects:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &2074502349
|
--- !u!1 &2074502349
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -7835,6 +7990,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1736330635485585599}
|
- {fileID: 1736330635485585599}
|
||||||
|
- {fileID: 2013137394}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
@ -51,6 +51,20 @@ MonoBehaviour:
|
||||||
text: READY\nUP
|
text: READY\nUP
|
||||||
- key: MULTIPLAYER_READYWAITING
|
- key: MULTIPLAYER_READYWAITING
|
||||||
text: WAITING
|
text: WAITING
|
||||||
|
- key: CONTINUE_CONTINUE
|
||||||
|
text: CONTINUE?
|
||||||
|
- key: CONTINUE_WAITING
|
||||||
|
text: WAITING...
|
||||||
|
- key: CONTINUE_REMATCH
|
||||||
|
text: REMATCH
|
||||||
|
- key: CONTINUE_RETURNTOLOBBY
|
||||||
|
text: RETURN TO LOBBY
|
||||||
|
- key: CONTINUE_LEAVEROOM
|
||||||
|
text: LEAVE ROOM
|
||||||
|
- key: GAME_START
|
||||||
|
text: START
|
||||||
|
- key: GAME_GAMESET
|
||||||
|
text: GAME SET
|
||||||
japaneseLocals:
|
japaneseLocals:
|
||||||
- key: GAME_SCORE
|
- key: GAME_SCORE
|
||||||
text: "\u30B9\u30B3\u30A2"
|
text: "\u30B9\u30B3\u30A2"
|
||||||
|
@ -90,6 +104,20 @@ MonoBehaviour:
|
||||||
text:
|
text:
|
||||||
- key: MULTIPLAYER_READYWAITING
|
- key: MULTIPLAYER_READYWAITING
|
||||||
text:
|
text:
|
||||||
|
- key: CONTINUE_CONTINUE
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_WAITING
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_REMATCH
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_RETURNTOLOBBY
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_LEAVEROOM
|
||||||
|
text:
|
||||||
|
- key: GAME_START
|
||||||
|
text:
|
||||||
|
- key: GAME_GAMESET
|
||||||
|
text:
|
||||||
spanishLocals:
|
spanishLocals:
|
||||||
- key: GAME_SCORE
|
- key: GAME_SCORE
|
||||||
text:
|
text:
|
||||||
|
@ -129,3 +157,17 @@ MonoBehaviour:
|
||||||
text:
|
text:
|
||||||
- key: MULTIPLAYER_READYWAITING
|
- key: MULTIPLAYER_READYWAITING
|
||||||
text:
|
text:
|
||||||
|
- key: CONTINUE_CONTINUE
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_WAITING
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_REMATCH
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_RETURNTOLOBBY
|
||||||
|
text:
|
||||||
|
- key: CONTINUE_LEAVEROOM
|
||||||
|
text:
|
||||||
|
- key: GAME_START
|
||||||
|
text:
|
||||||
|
- key: GAME_GAMESET
|
||||||
|
text:
|
||||||
|
|
|
@ -1305,6 +1305,7 @@ MonoBehaviour:
|
||||||
- {fileID: 476019859697837963, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: 476019859697837963, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
- {fileID: -3266883307812619558, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: -3266883307812619558, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
- {fileID: 6315238414147364039, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: 6315238414147364039, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
|
AIDifficulty: 1
|
||||||
--- !u!4 &1914041908
|
--- !u!4 &1914041908
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1288,6 +1288,9 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
player1: {fileID: 647195263}
|
player1: {fileID: 647195263}
|
||||||
player2: {fileID: 2143326256}
|
player2: {fileID: 2143326256}
|
||||||
|
headerTextMesh: {fileID: 2013137395}
|
||||||
|
startKey: GAME_START
|
||||||
|
gameSetKey: GAME_GAMESET
|
||||||
tilePrefab: {fileID: 1276126893238520547, guid: 1633489c4a2480b468c34263ec19c499,
|
tilePrefab: {fileID: 1276126893238520547, guid: 1633489c4a2480b468c34263ec19c499,
|
||||||
type: 3}
|
type: 3}
|
||||||
regular:
|
regular:
|
||||||
|
@ -1305,6 +1308,7 @@ MonoBehaviour:
|
||||||
- {fileID: 476019859697837963, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: 476019859697837963, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
- {fileID: -3266883307812619558, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: -3266883307812619558, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
- {fileID: 6315238414147364039, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
- {fileID: 6315238414147364039, guid: 520b03234005a4043ae643baa42fbb2d, type: 3}
|
||||||
|
AIDifficulty: 1
|
||||||
--- !u!4 &1914041908
|
--- !u!4 &1914041908
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1385,6 +1389,18 @@ PrefabInstance:
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 41564653a5d28dc4491420399b220d74, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 41564653a5d28dc4491420399b220d74, type: 3}
|
||||||
|
--- !u!114 &2013137395 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2013137395, guid: adba91609cb1e5448b76682be198fc9b,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1736330635466942931}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!114 &2143326256 stripped
|
--- !u!114 &2143326256 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_CorrespondingSourceObject: {fileID: 4556693131862667306, guid: 40e81298fef34864e981a27f7ebaf494,
|
m_CorrespondingSourceObject: {fileID: 4556693131862667306, guid: 40e81298fef34864e981a27f7ebaf494,
|
||||||
|
@ -1410,186 +1426,6 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635070797285, guid: adba91609cb1e5448b76682be198fc9b,
|
- target: {fileID: 1736330635070797285, guid: adba91609cb1e5448b76682be198fc9b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -1700,21 +1536,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMin.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchorMax.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1736330635485585598, guid: adba91609cb1e5448b76682be198fc9b,
|
- target: {fileID: 1736330635485585598, guid: adba91609cb1e5448b76682be198fc9b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: tDisplays.Array.data[0].target
|
propertyPath: tDisplays.Array.data[0].target
|
||||||
|
|
Loading…
Reference in New Issue