Refactored changes.
This commit is contained in:
parent
464e5fc46c
commit
a9af5d1d17
File diff suppressed because one or more lines are too long
@ -75,6 +75,6 @@ Material:
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.9716981, g: 0, b: 0, a: 1}
|
||||
- _Color: {r: 0.30817598, g: 0, b: 0, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -75,6 +75,6 @@ Material:
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.02055893, g: 0.6226415, b: 0.140847, a: 1}
|
||||
- _Color: {r: 0, g: 0.28930807, b: 0.058237344, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -75,6 +75,6 @@ Material:
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.9339623, g: 0.68642676, b: 0.004405493, a: 1}
|
||||
- _Color: {r: 0.8050314, g: 0.5910357, b: 0, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -75,6 +75,6 @@ Material:
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 0.6765175, b: 1, a: 1}
|
||||
- _Color: {r: 0, g: 0.14507334, b: 0.21383637, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -42,7 +42,7 @@ MeshFilter:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7993275380040288456}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &7993275380040288453
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -42,7 +42,7 @@ MeshFilter:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7993275380040288456}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &7993275380040288453
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -42,7 +42,7 @@ MeshFilter:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7993275380040288456}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &7993275380040288453
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -42,7 +42,7 @@ MeshFilter:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7993275380040288456}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &7993275380040288453
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -24,7 +24,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 141183527}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.06, y: 0, z: -1.03}
|
||||
m_LocalPosition: {x: -1.06, y: 1, z: -1.03}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -55,7 +55,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 165064736}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.89, y: 0, z: -0.92}
|
||||
m_LocalPosition: {x: 0.89, y: 1, z: -0.92}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -86,7 +86,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 172566720}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.88, y: 0, z: 1.12}
|
||||
m_LocalPosition: {x: 0.88, y: 1, z: 1.12}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -183,7 +183,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1619171258}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.09, y: 0, z: 1.26}
|
||||
m_LocalPosition: {x: -1.09, y: 1, z: 1.26}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
||||
@ -319,6 +319,108 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2960581183699728426, guid: 094ea6ce63e654b22964fec2f6344c8a, type: 3}
|
||||
m_PrefabInstance: {fileID: 77922092}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &86529552
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 86529556}
|
||||
- component: {fileID: 86529555}
|
||||
- component: {fileID: 86529554}
|
||||
- component: {fileID: 86529553}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &86529553
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 86529552}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &86529554
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 86529552}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &86529555
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 86529552}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &86529556
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 86529552}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 953941043}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1001 &101156877
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1115,7 +1217,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 257080519}
|
||||
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 3.4300003, y: 0, z: -2.369999}
|
||||
m_LocalPosition: {x: 3.38, y: 1, z: -2.87}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -1146,7 +1248,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 272998680}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: -2.63, y: 0, z: 4.4399986}
|
||||
m_LocalPosition: {x: -2.54, y: 1, z: 3.43}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -1601,7 +1703,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 385834240}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
|
||||
m_LocalPosition: {x: 3.4699993, y: 1, z: 4.49}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -1815,7 +1917,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 426836277}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
|
||||
m_LocalPosition: {x: 3.4300003, y: 1, z: -2.63}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -2069,7 +2171,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 501600305}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
|
||||
m_LocalPosition: {x: -2.6600008, y: 1, z: -2.2400007}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -3221,7 +3323,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 728473894}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
|
||||
m_LocalPosition: {x: 3.4300003, y: 1, z: -2.37}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -3836,6 +3938,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0483b263e22fc433caab31141efbe319, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
diceText: {fileID: 953941044}
|
||||
pointerDebug: {fileID: 102349503}
|
||||
pointerMeshRend: {fileID: 102349501}
|
||||
turnMat: {fileID: 2100000, guid: fa9603494d90e4aa594a90f433060426, type: 2}
|
||||
@ -4129,6 +4232,141 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2960581183699728426, guid: 094ea6ce63e654b22964fec2f6344c8a, type: 3}
|
||||
m_PrefabInstance: {fileID: 953003986}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &953941042
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 953941043}
|
||||
- component: {fileID: 953941045}
|
||||
- component: {fileID: 953941044}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &953941043
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 953941042}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 86529556}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 15, y: -11}
|
||||
m_SizeDelta: {x: 67.2485, y: 58.1276}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &953941044
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 953941042}
|
||||
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: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 0
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
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_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &953941045
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 953941042}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &963194225
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4237,7 +4475,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965030345}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
|
||||
m_LocalPosition: {x: 3.4699993, y: 1, z: 4.49}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -4855,7 +5093,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1070491403}
|
||||
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400017}
|
||||
m_LocalPosition: {x: -2.6600008, y: 1, z: -2.91}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -5140,7 +5378,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1097779049}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
|
||||
m_LocalPosition: {x: -2.6600008, y: 1, z: -2.2400007}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -5777,7 +6015,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1207327330}
|
||||
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 3.4699993, y: 0, z: 4.4900017}
|
||||
m_LocalPosition: {x: 3.48, y: 1, z: 3.99}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -5939,15 +6177,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -2.63
|
||||
value: -2.95
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
value: 0.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.4399986
|
||||
value: 4.08
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@ -6200,7 +6438,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1301684854}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
|
||||
m_LocalPosition: {x: 3.4300003, y: 1, z: -2.37}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -6451,7 +6689,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1460070746}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -2.63, y: 0, z: 4.4399996}
|
||||
m_LocalPosition: {x: -2.63, y: 1, z: 4.4399996}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -6798,7 +7036,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1586816316}
|
||||
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -2.63, y: 0, z: 4.4399986}
|
||||
m_LocalPosition: {x: -2.73, y: 1, z: 3.93}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -6968,15 +7206,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -2.6600008
|
||||
value: -2.78
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
value: 0.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -2.2400017
|
||||
value: -2.56
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@ -7045,15 +7283,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3.4300003
|
||||
value: 3.21
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
value: 0.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -2.369999
|
||||
value: -2.91
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@ -7218,7 +7456,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1742932126}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
|
||||
m_LocalPosition: {x: 3.22, y: 1, z: 4.06}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -7419,7 +7657,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1795608036}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
|
||||
m_LocalPosition: {x: -2.6600008, y: 1, z: -2.71}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -7804,15 +8042,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3.4699993
|
||||
value: 3.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
value: 0.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.4900017
|
||||
value: 4.09
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@ -8019,7 +8257,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2023317271}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -2.63, y: 0, z: 4.4399996}
|
||||
m_LocalPosition: {x: -2.63, y: 1, z: 4.4399996}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -8245,6 +8483,74 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: be69a8cfb3b2940308cbac570565e629, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2072781016
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2072781019}
|
||||
- component: {fileID: 2072781018}
|
||||
- component: {fileID: 2072781017}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &2072781017
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2072781016}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SendPointerHoverToParent: 1
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &2072781018
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2072781016}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 10
|
||||
--- !u!4 &2072781019
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2072781016}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &2090781612
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Xml.Schema;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
public enum PlayerTypes
|
||||
public enum PlayerType
|
||||
{
|
||||
Player1 = 0,
|
||||
Player2 = 1,
|
||||
Player3 = 2,
|
||||
Player4 = 3
|
||||
Player4 = 3,
|
||||
Bot
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class PlayerGameData
|
||||
{
|
||||
public PlayerTypes playerType;
|
||||
public PlayerType playerType;
|
||||
public int startIndex;
|
||||
public int endIndex;
|
||||
public Transform playersParent;
|
||||
@ -23,8 +24,17 @@ public class PlayerGameData
|
||||
public int totalPawnsFinished = 0;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public enum MatchType
|
||||
{
|
||||
LAN,
|
||||
Bot
|
||||
}
|
||||
|
||||
public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
{
|
||||
[SerializeField] private TextMeshProUGUI diceText;
|
||||
|
||||
[SerializeField] private Transform pointerDebug;
|
||||
[SerializeField] private MeshRenderer pointerMeshRend;
|
||||
[SerializeField] private Material turnMat;
|
||||
@ -33,14 +43,14 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
[SerializeField] private PlayerGameData[] playerGameDatas;
|
||||
[SerializeField] private PlayerBaseHandler playerBaseHandler;
|
||||
|
||||
private PlayerTypes currentPlayerTypeTurn;
|
||||
private PlayerType currentPlayerTypeTurn;
|
||||
private int currentPlayerTurnIndex = 0;
|
||||
private List<PlayerTypes> playerTypes = new List<PlayerTypes>();
|
||||
private List<PlayerType> playerTypes = new List<PlayerType>();
|
||||
|
||||
public List<PlayerTypes> PlayerTypesCollection => playerTypes;
|
||||
public List<PlayerType> PlayerTypesCollection => playerTypes;
|
||||
|
||||
// private Dictionary<PlayerTypes, > playerPawnsDict = new Dictionary<PlayerTypes, List<PlayerPawn>>();
|
||||
private Dictionary<PlayerTypes, PlayerGameData> playerGameDatasDict = new Dictionary<PlayerTypes, PlayerGameData>();
|
||||
private Dictionary<PlayerType, PlayerGameData> playerGameDatasDict = new Dictionary<PlayerType, PlayerGameData>();
|
||||
|
||||
private TilesManager tilesManager;
|
||||
|
||||
@ -62,12 +72,36 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
tilesManager = InterfaceManager.Instance.GetInterfaceInstance<TilesManager>();
|
||||
|
||||
CanRollDice = true;
|
||||
playerTypes = new List<PlayerTypes> { PlayerTypes.Player1, PlayerTypes.Player2, PlayerTypes.Player3, PlayerTypes.Player4 };
|
||||
|
||||
// initialize the player list from UI.
|
||||
InitPlayerTypesForLAN(null);
|
||||
}
|
||||
|
||||
// TODO :: Call when the UI selection is made and game starts
|
||||
public void InitPlayerTypesForLAN(List<PlayerType> types)
|
||||
{
|
||||
// TODO :: 2P, 3P, 4P
|
||||
playerTypes = new List<PlayerType> { PlayerType.Player1, PlayerType.Player2, PlayerType.Player3, PlayerType.Player4 };
|
||||
|
||||
playerBaseHandler.InitPlayerTypes(playerTypes);
|
||||
InitCurrentGamePlayerInfo();
|
||||
}
|
||||
|
||||
public void InitPlayerTypesForBotMatch(PlayerType selectedPlayerType, int botCount)
|
||||
{
|
||||
// test data
|
||||
if (botCount == 1)
|
||||
{
|
||||
var playerType = (PlayerType)((int)selectedPlayerType + 2 < Enum.GetValues(typeof(PlayerType)).Length ?
|
||||
(int)selectedPlayerType + 2 : (int)selectedPlayerType - 2);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// TODO :: Call based on 2P/3P/4P
|
||||
public void InitCurrentGamePlayerInfo()
|
||||
{
|
||||
@ -108,6 +142,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
// add core dice logic here
|
||||
Debug.Log($"Tile Index :: LUDO :: rolledVal: {rolledVal} :: {currentPlayerTypeTurn}");
|
||||
diceRolledValue = rolledVal;
|
||||
diceText.text = $"{diceRolledValue}";
|
||||
|
||||
if (rolledVal == Ludo_3D_Constants.Max_Dice_Rolls)
|
||||
{
|
||||
@ -226,7 +261,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
|
||||
if (safeTile.PlayerTypesCount == 1)
|
||||
{
|
||||
PlayerTypes playerType = safeTile.GetFirstPlayerType();
|
||||
PlayerType playerType = safeTile.GetFirstPlayerType();
|
||||
|
||||
var playerPawns = safeTile.GetPlayerPawns(playerType);
|
||||
foreach (var pawn in playerPawns)
|
||||
@ -275,6 +310,8 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
currentPlayerTurnIndex++;
|
||||
currentPlayerTypeTurn = playerTypes[currentPlayerTurnIndex];
|
||||
}
|
||||
|
||||
diceText.text = $"{0}";
|
||||
}
|
||||
|
||||
Debug.Log($"CurrentPlayerTurn: {currentPlayerTypeTurn}");
|
||||
@ -370,7 +407,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
|
||||
Debug.Log($"targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn): {targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)}");
|
||||
if (!targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)) // means it is a new player type, the second one
|
||||
{
|
||||
PlayerTypes initialPlayerType = targetSafeTile.GetFirstPlayerType();
|
||||
PlayerType initialPlayerType = targetSafeTile.GetFirstPlayerType();
|
||||
|
||||
// rearrange already existing player from center position to it's saved transform
|
||||
var playerPawns = targetSafeTile.GetPlayerPawns(initialPlayerType);
|
||||
|
||||
@ -9,11 +9,11 @@ public class BasePlacementData
|
||||
|
||||
public class PlayerBase : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private PlayerTypes playerType;
|
||||
[SerializeField] private PlayerType playerType;
|
||||
[SerializeField] private BasePlacementData[] basePlacementDatas;
|
||||
[SerializeField] private PlayerPawn[] playerPawns;
|
||||
|
||||
public PlayerTypes GetPlayerType() => playerType;
|
||||
public PlayerType GetPlayerType() => playerType;
|
||||
|
||||
public void InitPlayerData()
|
||||
{
|
||||
|
||||
@ -5,7 +5,7 @@ using UnityEngine;
|
||||
[System.Serializable]
|
||||
public class PlayerBaseData
|
||||
{
|
||||
public PlayerTypes playerType;
|
||||
public PlayerType playerType;
|
||||
public PlayerBase playerBase;
|
||||
}
|
||||
|
||||
@ -13,9 +13,9 @@ public class PlayerBaseHandler : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private PlayerBase[] playerBases;
|
||||
|
||||
private Dictionary<PlayerTypes, PlayerBase> playerBasesDict = new Dictionary<PlayerTypes, PlayerBase>();
|
||||
private Dictionary<PlayerType, PlayerBase> playerBasesDict = new Dictionary<PlayerType, PlayerBase>();
|
||||
|
||||
public void InitPlayerTypes(List<PlayerTypes> playerTypes)
|
||||
public void InitPlayerTypes(List<PlayerType> playerTypes)
|
||||
{
|
||||
foreach (PlayerBase playerBase in playerBases)
|
||||
{
|
||||
@ -36,7 +36,7 @@ public class PlayerBaseHandler : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public PlayerBase GetPlayerBase(PlayerTypes playerType)
|
||||
public PlayerBase GetPlayerBase(PlayerType playerType)
|
||||
{
|
||||
return playerBasesDict[playerType];
|
||||
}
|
||||
|
||||
@ -16,6 +16,8 @@ public class PlayerPawn : MonoBehaviour
|
||||
[SerializeField] private PlayerState playerState;
|
||||
|
||||
private bool canSelectPlayerFromHome;
|
||||
private GameplayManager gameplayManager;
|
||||
|
||||
public int CurrentTileIndex
|
||||
{
|
||||
get; private set;
|
||||
@ -26,32 +28,20 @@ public class PlayerPawn : MonoBehaviour
|
||||
get; private set;
|
||||
}
|
||||
|
||||
public int BaseId
|
||||
public PlayerType PlayerType
|
||||
{
|
||||
get; private set;
|
||||
}
|
||||
|
||||
public PlayerTypes PlayerType
|
||||
{
|
||||
get; private set;
|
||||
}
|
||||
|
||||
private GameplayManager gameplayManager;
|
||||
|
||||
public void SetPlayerSelectionState(bool state)
|
||||
{
|
||||
canSelectPlayerFromHome = state;
|
||||
if (canSelectPlayerFromHome)
|
||||
{
|
||||
// Play animation for selecting any of the players
|
||||
// TODO :: Play animation for selecting any of the players
|
||||
}
|
||||
}
|
||||
|
||||
public void SetCurrentTileIndex(int tileIndex)
|
||||
{
|
||||
CurrentTileIndex = tileIndex;
|
||||
}
|
||||
|
||||
public void MoveToTile(Vector3 startingPoint, Action onComplete, int tileIndex)
|
||||
{
|
||||
CurrentTileIndex = tileIndex;
|
||||
@ -89,7 +79,7 @@ public class PlayerPawn : MonoBehaviour
|
||||
gameplayManager = gameplayManager ?? InterfaceManager.Instance.GetInterfaceInstance<GameplayManager>();
|
||||
}
|
||||
|
||||
public void Init(int id, PlayerTypes playerType)
|
||||
public void Init(int id, PlayerType playerType)
|
||||
{
|
||||
PlayerId = id;
|
||||
PlayerType = playerType;
|
||||
|
||||
@ -27,7 +27,8 @@ public class DiceRoller : MonoBehaviour
|
||||
|
||||
private void OnDiceRolled()
|
||||
{
|
||||
int currentRolledVal = diceTestValue != 0 ? diceTestValue : Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
|
||||
int currentRolledVal = Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
|
||||
// diceTestValue != 0 ? diceTestValue : Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
|
||||
inputManager.SetDiceRollValue(currentRolledVal);
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@ public class SafeTile : Tile
|
||||
[SerializeField] private Transform[] placementPoints;
|
||||
|
||||
protected Queue<Transform> placementQueue = new Queue<Transform>();
|
||||
protected Dictionary<PlayerTypes, PlayerTileData> playerTypesDict = new Dictionary<PlayerTypes, PlayerTileData>();
|
||||
protected Dictionary<PlayerType, PlayerTileData> playerTypesDict = new Dictionary<PlayerType, PlayerTileData>();
|
||||
|
||||
public int PlayerTypesCount => playerTypesDict.Count;
|
||||
public bool HasMoreThanOnePlayerType => playerTypesDict.Count > 1;
|
||||
public List<PlayerPawn> GetPlayerPawns(PlayerTypes playerType) => playerTypesDict[playerType].playerPawns.Values.ToList();
|
||||
public List<PlayerPawn> GetPlayerPawns(PlayerType playerType) => playerTypesDict[playerType].playerPawns.Values.ToList();
|
||||
|
||||
public bool ContainsPlayerType(PlayerTypes playerType) => playerTypesDict.ContainsKey(playerType);
|
||||
public bool ContainsPlayerType(PlayerType playerType) => playerTypesDict.ContainsKey(playerType);
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@ -24,7 +24,7 @@ public class SafeTile : Tile
|
||||
}
|
||||
}
|
||||
|
||||
public override void InitPlayerPawn(PlayerPawn playerPawn, PlayerTypes playerType)
|
||||
public override void InitPlayerPawn(PlayerPawn playerPawn, PlayerType playerType)
|
||||
{
|
||||
// PlayerPawn = playerPawn;
|
||||
if (!playerTypesDict.ContainsKey(playerType))
|
||||
@ -48,7 +48,7 @@ public class SafeTile : Tile
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateSafeZonePlayerData(PlayerTypes playerType, PlayerPawn playerPawn)
|
||||
public void UpdateSafeZonePlayerData(PlayerType playerType, PlayerPawn playerPawn)
|
||||
{
|
||||
if (playerTypesDict.ContainsKey(playerType))
|
||||
{
|
||||
@ -70,19 +70,19 @@ public class SafeTile : Tile
|
||||
}
|
||||
}
|
||||
|
||||
public PlayerTypes GetFirstPlayerType() => playerTypesDict.Keys.FirstOrDefault();
|
||||
public PlayerType GetFirstPlayerType() => playerTypesDict.Keys.FirstOrDefault();
|
||||
|
||||
public int GetPlayerPawnsCountInTile(PlayerTypes playerType)
|
||||
public int GetPlayerPawnsCountInTile(PlayerType playerType)
|
||||
{
|
||||
return playerTypesDict[playerType].playerPawns.Count;
|
||||
}
|
||||
|
||||
public PlayerPawn IterateAndGetPlayerPawn(PlayerTypes playerType, int index)
|
||||
public PlayerPawn IterateAndGetPlayerPawn(PlayerType playerType, int index)
|
||||
{
|
||||
return playerTypesDict[playerType].playerPawns[index + 1];
|
||||
}
|
||||
|
||||
public Transform GetPlacementPoint(PlayerTypes playerType)
|
||||
public Transform GetPlacementPoint(PlayerType playerType)
|
||||
{
|
||||
return playerTypesDict[playerType].commonPlacementTransform;
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ public class Tile : MonoBehaviour
|
||||
|
||||
public bool IsSafeZone => isSafeZone;
|
||||
|
||||
public Vector3 CenterPlacementPosition => transform.position;
|
||||
public Vector3 CenterPlacementPosition => new Vector3(transform.position.x, 1f, transform.position.z);
|
||||
|
||||
protected int lastOccupiedIndex = 0;
|
||||
|
||||
@ -31,7 +31,7 @@ public class Tile : MonoBehaviour
|
||||
get; private set;
|
||||
}
|
||||
|
||||
public virtual void InitPlayerPawn(PlayerPawn playerPawn, PlayerTypes playerType)
|
||||
public virtual void InitPlayerPawn(PlayerPawn playerPawn, PlayerType playerType)
|
||||
{
|
||||
PlayerPawn = playerPawn;
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ using UnityEngine.Tilemaps;
|
||||
[System.Serializable]
|
||||
public struct TileData
|
||||
{
|
||||
public PlayerTypes playerType;
|
||||
public PlayerType playerType;
|
||||
public Transform playerFinishingTileParent;
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
|
||||
|
||||
private GameplayManager gameplayManager;
|
||||
|
||||
private Dictionary<PlayerTypes, List<Transform>> finishingTileDataPairs = new Dictionary<PlayerTypes, List<Transform>>();
|
||||
private Dictionary<PlayerType, List<Transform>> finishingTileDataPairs = new Dictionary<PlayerType, List<Transform>>();
|
||||
|
||||
public void Initialize()
|
||||
{
|
||||
@ -40,7 +40,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
|
||||
}
|
||||
}
|
||||
|
||||
public int GetFinishingTileDataLength(PlayerTypes playerType) => finishingTileDataPairs[playerType].Count;
|
||||
public int GetFinishingTileDataLength(PlayerType playerType) => finishingTileDataPairs[playerType].Count;
|
||||
|
||||
public int GetGeneralTilesLength() => generalTiles.Length;
|
||||
|
||||
@ -57,7 +57,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
|
||||
return tile;
|
||||
}
|
||||
|
||||
public Transform RetrievePositionForFinishingTile(PlayerTypes playerType, int index)
|
||||
public Transform RetrievePositionForFinishingTile(PlayerType playerType, int index)
|
||||
{
|
||||
return finishingTileDataPairs[playerType][index];
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user