Обновить игровую логику и интерфейс
This commit is contained in:
parent
5342681d59
commit
33bebd9730
@ -30,3 +30,4 @@ MonoBehaviour:
|
||||
text: "\u041B\u044E\u0431\u043B\u044E \u043A\u043E\u0433\u0434\u0430 \u0432\u0441\u0451
|
||||
\u0441\u043A\u043B\u0430\u0434\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u0432
|
||||
\u043C\u043E\u044E \u043F\u043E\u043B\u044C\u0437\u0443."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -32,3 +32,4 @@ MonoBehaviour:
|
||||
- clip: {fileID: 8300000, guid: ef95e16bb62039a458905c37917b54ca, type: 3}
|
||||
text: "\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D.
|
||||
\u0422\u044B \u043F\u0440\u043E\u0438\u0433\u0440\u0430\u043B."
|
||||
<PlayProbability>k__BackingField: 1
|
||||
|
||||
@ -30,3 +30,4 @@ MonoBehaviour:
|
||||
\u041D\u0435\u0442 \u044F \u0432\u0441\u0435 \u0440\u0430\u0432\u043D\u043E
|
||||
\u043D\u0435 \u043F\u043E\u043D\u0438\u043C\u0430\u044E \u043D\u0430 \u0447\u0442\u043E
|
||||
\u0442\u044B \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u044B\u0432\u0430\u043B"
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -25,3 +25,4 @@ MonoBehaviour:
|
||||
- clip: {fileID: 8300000, guid: a3c8145e7e88c0c4a8bde3aa68f0e222, type: 3}
|
||||
text: "\u0425\u043E\u0434 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u043D.
|
||||
\u041E\u0442\u043E\u0439\u0434\u0438."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -25,3 +25,4 @@ MonoBehaviour:
|
||||
- clip: {fileID: 8300000, guid: dc54c6ec04eb4de459641cf88194da62, type: 3}
|
||||
text: "\u0423\u0432\u0435\u0440\u0435\u043D? \u041F\u043E\u0442\u043E\u043C\u0443
|
||||
\u0447\u0442\u043E \u0432\u044B\u0433\u043B\u044F\u0434\u0438\u0442 \u0433\u043B\u0443\u043F\u043E."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -27,3 +27,4 @@ MonoBehaviour:
|
||||
text: "\u041F\u0440\u0435\u0438\u043C\u0443\u0449\u0435\u0441\u0442\u0432\u043E
|
||||
\u043D\u0430 \u043C\u043E\u0435\u0439 \u0441\u0442\u043E\u0440\u043E\u043D\u0435.
|
||||
\u041A\u0430\u043A \u0438 \u0437\u0443\u0431\u044B."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -29,3 +29,4 @@ MonoBehaviour:
|
||||
text: "\u041D\u0435\u043F\u043B\u043E\u0445\u043E. \u041D\u043E \u044F \u0443\u0436\u0435
|
||||
\u0437\u043D\u0430\u044E \u043A\u0443\u0434\u0430 \u0442\u044B \u043F\u043E\u0439\u0434\u0435\u0448\u044C
|
||||
\u0434\u0430\u043B\u044C\u0448\u0435."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -31,3 +31,4 @@ MonoBehaviour:
|
||||
\u043C\u043E\u043B\u0447\u0438\u0442, \u043B\u0443\u0447\u0448\u0435 \u043D\u0435
|
||||
\u0434\u0430\u0432\u0430\u0442\u044C \u0435\u043C\u0443 \u043F\u0440\u0438\u0447\u0438\u043D\u044B
|
||||
\u0437\u0430\u0433\u043E\u0432\u043E\u0440\u0438\u0442\u044C."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -30,3 +30,4 @@ MonoBehaviour:
|
||||
text: "\u041E\u0434\u043D\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 \u043D\u0435
|
||||
\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0431\u043E\u0439.
|
||||
\u041D\u043E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F - \u043C\u043E\u0436\u0435\u0442."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -32,3 +32,4 @@ MonoBehaviour:
|
||||
text: "\u0423\u043B\u044B\u0431\u043D\u0438\u0441\u044C. \u0418\u043B\u0438 \u0431\u0443\u0434\u0435\u0448\u044C
|
||||
\u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0432\u0430\u0442\u044C \u0441 \u0442\u0430\u043A\u0438\u043C
|
||||
\u043A\u0438\u0441\u043B\u044B\u043C \u043B\u0438\u0446\u043E\u043C?"
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -31,3 +31,4 @@ MonoBehaviour:
|
||||
\u0443 \u0442\u0435\u0431\u044F \u0435\u0441\u0442\u044C \u043F\u043B\u0430\u043D.
|
||||
\u042F \u043F\u043E\u043A\u0430 \u043F\u043E\u043D\u0430\u0431\u043B\u044E\u0434\u0430\u044E
|
||||
\u043A\u0430\u043A \u0442\u044B \u0442\u043E\u043D\u0435\u0448\u044C."
|
||||
<PlayProbability>k__BackingField: 0.3
|
||||
|
||||
@ -35,6 +35,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7212224704880402101}
|
||||
- {fileID: 488766050343072904}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8039207184498597514
|
||||
@ -47,7 +48,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u041A\u044C\u044E\u0431"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -63,23 +64,23 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 84da6ca280c0ea746bd14d1c45b7272a, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule
|
||||
icon: {fileID: -8149160197350721816, guid: fbeb9853b48ea2844a0115637f7d3427, type: 3}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: -8703082228858259314, guid: 86e3e7edd9d4ad44badffb017e45ffc7, type: 3}
|
||||
_messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 1528631932536492394}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 20, y: -7.17}
|
||||
VisiblePos: {x: 9.26, y: -7.17}
|
||||
_messageBox: {fileID: 6411625206461815074}
|
||||
_replicas: {fileID: 11400000, guid: 962fdd232e378c940af200190a7e7529, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 1528631932536492394}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 20, y: -7.17}
|
||||
_visiblePos: {x: 9.26, y: -7.17}
|
||||
--- !u!114 &6346851752755896837
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -302,3 +303,140 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &4825203394296184692
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8604408698177003535}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.x
|
||||
value: -0.14000003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.y
|
||||
value: 0.9077778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.x
|
||||
value: 0.2777778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.y
|
||||
value: 0.2777778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.2777778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.2777778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.14000003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.9077778
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!224 &488766050343072904 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 4825203394296184692}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6411625206461815074 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 4825203394296184692}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
|
||||
@ -35,6 +35,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5622746753824456797}
|
||||
- {fileID: 7731004932607571712}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8233466963536421093
|
||||
@ -47,7 +48,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0422\u043E\u043C"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -63,23 +64,23 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 84da6ca280c0ea746bd14d1c45b7272a, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule
|
||||
icon: {fileID: -529477370105943367, guid: 229dd13b366e5b04ab570cce8b4796e4, type: 3}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: 6137273327222775856, guid: 22249bfcd1079244da596525df47b46c, type: 3}
|
||||
_messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4924238884005179083}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 11.8, y: -20}
|
||||
VisiblePos: {x: 11.8, y: -3.91}
|
||||
_messageBox: {fileID: 3853063690685061802}
|
||||
_replicas: {fileID: 11400000, guid: 173a9f49aa109294b99d32afe9c9d1d3, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4924238884005179083}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 11.8, y: -20}
|
||||
_visiblePos: {x: 11.8, y: -3.91}
|
||||
--- !u!114 &2927423071651238219
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -302,3 +303,140 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &3419620562428607740
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 8312733962015895203}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.x
|
||||
value: -0.54285717
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.y
|
||||
value: 0.7014286
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.x
|
||||
value: 0.35714287
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.y
|
||||
value: 0.35714287
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.35714287
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.35714287
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.54285717
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.7014286
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!114 &3853063690685061802 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 3419620562428607740}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
--- !u!224 &7731004932607571712 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 3419620562428607740}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -126,6 +126,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7517247222320477357}
|
||||
- {fileID: 2888158024061703287}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6676369703225837789
|
||||
@ -138,7 +139,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0420\u043E\u0431\u043E\u0432\u043E\u043B\u043A"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -154,23 +155,23 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 84da6ca280c0ea746bd14d1c45b7272a, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule
|
||||
icon: {fileID: -1307639399570084333, guid: e35c65295e3ac234b9975dbe342f4090, type: 3}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: -5258756546513945857, guid: c99c8ec80e4ab564f8f6e07f132a6a08, type: 3}
|
||||
_messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4476514036158972146}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 40, y: -4.26916}
|
||||
VisiblePos: {x: 13.61, y: -4.26916}
|
||||
_messageBox: {fileID: 8513515708309879261}
|
||||
_replicas: {fileID: 11400000, guid: 5557ed781de3b7947a8a3ef626bba936, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4476514036158972146}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 40, y: -4.26916}
|
||||
_visiblePos: {x: 13.61, y: -4.26916}
|
||||
--- !u!114 &4781704477309761372
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -302,3 +303,140 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1001 &7794093394033385355
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7360891851470844778}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.x
|
||||
value: -0.40071425
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.y
|
||||
value: 0.37636855
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.x
|
||||
value: 0.17857143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.y
|
||||
value: 0.17857143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.17857143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.17857143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.40071425
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.37636855
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!224 &2888158024061703287 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 7794093394033385355}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8513515708309879261 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 7794093394033385355}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
|
||||
@ -35,6 +35,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4691552243389303104}
|
||||
- {fileID: 7899389686938038192}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3215344534852605381
|
||||
@ -47,7 +48,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0421\u0430\u043C\u0443\u0440\u0430\u0439"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -68,18 +69,18 @@ MonoBehaviour:
|
||||
icon: {fileID: 1809351836, guid: f52ee716872562446b5261ef80b4e8cd, type: 3}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: 7841686331975577030, guid: 5acad8b165856bf429879df3068a8f53, type: 3}
|
||||
_messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 7661847991293490837}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 30, y: -5.53}
|
||||
VisiblePos: {x: 13.11, y: -5.53}
|
||||
_messageBox: {fileID: 3716204256017220122}
|
||||
_replicas: {fileID: 11400000, guid: a47724be33eb26349a63cc7107a7e9a9, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 7661847991293490837}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 30, y: -5.53}
|
||||
_visiblePos: {x: 13.11, y: -5.53}
|
||||
--- !u!95 &7661847991293490837
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
@ -302,3 +303,140 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &2999018979682624588
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 5186870215910804923}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.x
|
||||
value: -0.34066665
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.y
|
||||
value: 0.43533334
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.x
|
||||
value: 0.16666667
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.y
|
||||
value: 0.16666667
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.16666667
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.16666667
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.34066665
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.43533334
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!114 &3716204256017220122 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 2999018979682624588}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
--- !u!224 &7899389686938038192 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 2999018979682624588}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -35,6 +35,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3379644201319798410}
|
||||
- {fileID: 2846157273617141347}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5982990141465619124
|
||||
@ -47,7 +48,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0424\u0438\u0448\u043A\u0430"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -68,18 +69,18 @@ MonoBehaviour:
|
||||
icon: {fileID: -1325076913608113314, guid: b865778670f0b8c418a3450c41975937, type: 3}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: -3439533911878954697, guid: be3a1e10203463d42a388463674e5a4f, type: 3}
|
||||
_messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4847740494483037661}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 22.99, y: -7.6}
|
||||
VisiblePos: {x: 12.57, y: -7.6}
|
||||
_messageBox: {fileID: 8740728146530722761}
|
||||
_replicas: {fileID: 11400000, guid: 617ebfda252f8ec42b09a1d014654aa3, type: 2}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 4847740494483037661}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 22.99, y: -7.6}
|
||||
_visiblePos: {x: 12.57, y: -7.6}
|
||||
--- !u!95 &4847740494483037661
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
@ -302,3 +303,140 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &7152127682810496415
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1614469809881018309}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.x
|
||||
value: -0.3808333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _localPos.y
|
||||
value: 0.71666664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.x
|
||||
value: 0.20833333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: _visibleScale.y
|
||||
value: 0.20833333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.20833333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.20833333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.3808333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.71666664
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!224 &2846157273617141347 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 7152127682810496415}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &8740728146530722761 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 7152127682810496415}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
|
||||
@ -125,6 +125,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6949531226854133324}
|
||||
- {fileID: 8856967023647932276}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6539353085705373350
|
||||
@ -137,7 +138,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0422\u043E\u043C"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -158,18 +159,18 @@ MonoBehaviour:
|
||||
icon: {fileID: 0}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: 8977629392806811432, guid: eccb9dcb5b85c994eaecc71044391a28, type: 3}
|
||||
_messageBox: {fileID: 0}
|
||||
replicas: {fileID: 0}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 0}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 0, y: 0}
|
||||
VisiblePos: {x: 0, y: 0}
|
||||
_messageBox: {fileID: 2655045227622093534}
|
||||
_replicas: {fileID: 0}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 0}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 0, y: 0}
|
||||
_visiblePos: {x: 0, y: 0}
|
||||
--- !u!95 &5861221381087209136
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
@ -289,3 +290,116 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1001 &4527426435070194824
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2897043272518743785}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!114 &2655045227622093534 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 4527426435070194824}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
--- !u!224 &8856967023647932276 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 4527426435070194824}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -125,6 +125,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5630567136895319462}
|
||||
- {fileID: 6139769624907924928}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5549115199695911390
|
||||
@ -137,7 +138,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: aa123dd73e3dcc84c9f46ca695aa1b17, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.Character
|
||||
characterName: "\u0422\u043E\u043C"
|
||||
difficultyModule: {fileID: 11400000, guid: a3e2c9fd2fee87943af2947d5eb72597, type: 2}
|
||||
@ -158,18 +159,18 @@ MonoBehaviour:
|
||||
icon: {fileID: 0}
|
||||
iconSmall: {fileID: 0}
|
||||
chipImage: {fileID: 2890665761737359033, guid: b7ecf582aadeda84ca3d05d27ea5adef, type: 3}
|
||||
_messageBox: {fileID: 0}
|
||||
replicas: {fileID: 0}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 0}
|
||||
chipSpawningAnim: {fileID: 0}
|
||||
chipThrowClip: {fileID: 0}
|
||||
showDuration: 1
|
||||
hideDuration: 1
|
||||
showEase: 1
|
||||
hideEase: 1
|
||||
HiddenPos: {x: 0, y: 0}
|
||||
VisiblePos: {x: 0, y: 0}
|
||||
_messageBox: {fileID: 794338825676400746}
|
||||
_replicas: {fileID: 0}
|
||||
_audioSource: {fileID: 0}
|
||||
_animator: {fileID: 0}
|
||||
_showDuration: 1
|
||||
_hideDuration: 1
|
||||
_showEase: 1
|
||||
_hideEase: 1
|
||||
_hiddenPos: {x: 0, y: 0}
|
||||
_visiblePos: {x: 0, y: 0}
|
||||
--- !u!95 &6115556701839820711
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
@ -289,3 +290,116 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1001 &1227852396092100156
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3425933489318842329}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8620231027088551242, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MessageBox
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
--- !u!114 &794338825676400746 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 1227852396092100156}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3a6ba6cd455be0e43985c4c7663c0596, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
--- !u!224 &6139769624907924928 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4917617217911147516, guid: 50b5075221b823240b287cd5e6c02d64, type: 3}
|
||||
m_PrefabInstance: {fileID: 1227852396092100156}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -58,14 +58,14 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.96}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: bf65b9affd8e1304d9074d6271c9ac04, type: 3}
|
||||
m_Sprite: {fileID: -7148614791175851956, guid: dc142ba18b2f32e46b05e49345242b5a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -109,8 +109,8 @@ RectTransform:
|
||||
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.043}
|
||||
m_SizeDelta: {x: 0, y: -1.4016}
|
||||
m_AnchoredPosition: {x: -0.003700018, y: 0.29260004}
|
||||
m_SizeDelta: {x: -0.2421, y: -1.0746}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2477658180085709316
|
||||
CanvasRenderer:
|
||||
@ -140,17 +140,19 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: New Text
|
||||
m_text: "\u043D\u0435 \u043F\u043E\u043C\u043D\u044E \u044F \u0438\u0445 \u0440\u0435\u043F\u043B\u0438\u043A\u0438
|
||||
\u0441\u043E\u0432\u0441\u0435\u043C, \u043F\u0440\u043E\u0441\u0442\u0438\u0442\u0435
|
||||
\u043F\u043E\u043C\u043E\u0433\u0438\u0442\u0435"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 47e175ba6cb1126439b5583572a406fe, type: 2}
|
||||
m_sharedMaterial: {fileID: 8312110174854069929, guid: 47e175ba6cb1126439b5583572a406fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 4f645b7426b379248bf44c703f8fbd2a, type: 2}
|
||||
m_sharedMaterial: {fileID: -7443843586772838647, guid: 4f645b7426b379248bf44c703f8fbd2a, 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}
|
||||
rgba: 4279505940
|
||||
m_fontColor: {r: 0.08, g: 0.08, b: 0.08, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -167,12 +169,12 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 0.35
|
||||
m_fontSizeBase: 0.5
|
||||
m_fontSize: 0.17
|
||||
m_fontSizeBase: 0.17
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 0
|
||||
m_fontSizeMax: 64
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 0.1
|
||||
m_fontSizeMax: 0.24
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
@ -237,17 +239,17 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6679944310692155710}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0.037327386, w: 0.9993031}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4917617217911147516}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4.278}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.901}
|
||||
m_SizeDelta: {x: 0, y: -1.4016}
|
||||
m_AnchoredPosition: {x: -0.024999976, y: 1.095}
|
||||
m_SizeDelta: {x: 0, y: -1.5939}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7454287611703797159
|
||||
CanvasRenderer:
|
||||
@ -279,15 +281,15 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u0422\u043E\u043C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 47e175ba6cb1126439b5583572a406fe, type: 2}
|
||||
m_sharedMaterial: {fileID: 8312110174854069929, guid: 47e175ba6cb1126439b5583572a406fe, type: 2}
|
||||
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}
|
||||
rgba: 0
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -312,7 +314,7 @@ MonoBehaviour:
|
||||
m_fontSizeMax: 64
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 1024
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterHorizontalScale: 1
|
||||
@ -364,7 +366,7 @@ GameObject:
|
||||
- component: {fileID: 1876940890959816278}
|
||||
- component: {fileID: 8112158254562883423}
|
||||
m_Layer: 5
|
||||
m_Name: TestMessageBox
|
||||
m_Name: MessageBox
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -414,7 +416,7 @@ Canvas:
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_SortingOrder: 50
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &8012185055219410538
|
||||
MonoBehaviour:
|
||||
@ -438,7 +440,7 @@ MonoBehaviour:
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!114 &8428301645144312930
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -470,10 +472,11 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.MessageBox
|
||||
_frame: {fileID: 4917617217911147516}
|
||||
_localPos: {x: 0, y: 0}
|
||||
nameLabel: {fileID: 7725792043156676869}
|
||||
textField: {fileID: 5385475176474712663}
|
||||
_visibleScale: {x: 1, y: 1, z: 1}
|
||||
_nameLabel: {fileID: 7725792043156676869}
|
||||
_textField: {fileID: 5385475176474712663}
|
||||
_audioSource: {fileID: 8112158254562883423}
|
||||
typeClip: {fileID: 8300000, guid: 1c48900c9ab0aa8418920a8193050870, type: 3}
|
||||
_typeClip: {fileID: 8300000, guid: 1c48900c9ab0aa8418920a8193050870, type: 3}
|
||||
--- !u!82 &8112158254562883423
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -486,7 +489,7 @@ AudioSource:
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
@ -1,9 +1,10 @@
|
||||
using Cysharp.Threading.Tasks;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using DG.Tweening;
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
namespace CharacterSystem
|
||||
{
|
||||
@ -11,112 +12,191 @@ namespace CharacterSystem
|
||||
{
|
||||
[SerializeField] private Transform _frame;
|
||||
[SerializeField] private Vector2 _localPos;
|
||||
[SerializeField] private TextMeshProUGUI nameLabel;
|
||||
[SerializeField] private TextMeshProUGUI textField;
|
||||
[SerializeField] private Vector3 _visibleScale = Vector3.one;
|
||||
[SerializeField, FormerlySerializedAs("nameLabel")] private TextMeshProUGUI _nameLabel;
|
||||
[SerializeField, FormerlySerializedAs("textField")] private TextMeshProUGUI _textField;
|
||||
[SerializeField] private AudioSource _audioSource;
|
||||
[SerializeField] private AudioClip typeClip;
|
||||
private bool nowTyping;
|
||||
private CancellationTokenSource _cts;
|
||||
[SerializeField, FormerlySerializedAs("typeClip")] private AudioClip _typeClip;
|
||||
[SerializeField, Min(0.01f)] private float _minimumFontSize = 0.1f;
|
||||
[SerializeField, Min(0.01f)] private float _maximumFontSize = 0.24f;
|
||||
[SerializeField, Range(1, 16)] private int _fontSizeSearchIterations = 10;
|
||||
|
||||
private float lastTypeSoundTime;
|
||||
private float typeClipLength;
|
||||
private CancellationTokenSource _cancellationTokenSource;
|
||||
private bool _isProcessing;
|
||||
private float _lastTypeSoundTime;
|
||||
private float _typeClipLength;
|
||||
|
||||
private void OnDestroy()
|
||||
=> Stop();
|
||||
|
||||
public void Initialize(string characterName)
|
||||
{
|
||||
nameLabel.text = characterName;
|
||||
_frame.position = _localPos;
|
||||
lastTypeSoundTime = 0;
|
||||
typeClipLength = typeClip != null ? typeClip.length : 0;
|
||||
_nameLabel.text = characterName;
|
||||
_nameLabel.gameObject.SetActive(false);
|
||||
_frame.localPosition = _localPos;
|
||||
_frame.localScale = Vector3.zero;
|
||||
_lastTypeSoundTime = 0f;
|
||||
_typeClipLength = _typeClip != null ? _typeClip.length : 0f;
|
||||
}
|
||||
|
||||
public async UniTask PlayReplica(Replica replica, bool force = false)
|
||||
public void PlayReplica(Replica replica, bool force = false, bool showName = false)
|
||||
{
|
||||
if (nowTyping && force == false) return;
|
||||
|
||||
Stop();
|
||||
|
||||
_cts = new();
|
||||
nowTyping = true;
|
||||
|
||||
await GetShowSequence().WithCancellation(_cts.Token);
|
||||
await TypeAsync(replica, _cts.Token);
|
||||
await UniTask.Delay(1000, cancellationToken: _cts.Token);
|
||||
await GetHideSequence().WithCancellation(_cts.Token);
|
||||
|
||||
Stop();
|
||||
}
|
||||
|
||||
private async UniTask TypeAsync(Replica replica, CancellationToken ct)
|
||||
{
|
||||
string message = replica.text;
|
||||
|
||||
if (replica.Duration == 0 || string.IsNullOrEmpty(message))
|
||||
{
|
||||
textField.text = message;
|
||||
if (_isProcessing && force == false)
|
||||
return;
|
||||
|
||||
if (force)
|
||||
CancelCurrent();
|
||||
|
||||
SetOptimalFontSize(replica.text ?? string.Empty);
|
||||
ProcessReplicaAsync(replica, showName).Forget();
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
{
|
||||
CancelCurrent();
|
||||
_cancellationTokenSource = null;
|
||||
_isProcessing = false;
|
||||
_audioSource.Stop();
|
||||
_frame.DOKill();
|
||||
_frame.localScale = Vector3.zero;
|
||||
_nameLabel.gameObject.SetActive(false);
|
||||
_textField.text = string.Empty;
|
||||
}
|
||||
|
||||
private async UniTask ProcessReplicaAsync(Replica replica, bool showName)
|
||||
{
|
||||
var currentTokenSource = new CancellationTokenSource();
|
||||
_cancellationTokenSource = currentTokenSource;
|
||||
_isProcessing = true;
|
||||
|
||||
try
|
||||
{
|
||||
await PlayReplicaAsync(replica, showName, currentTokenSource.Token);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (_cancellationTokenSource == currentTokenSource)
|
||||
{
|
||||
_cancellationTokenSource = null;
|
||||
_isProcessing = false;
|
||||
}
|
||||
|
||||
currentTokenSource.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private async UniTask PlayReplicaAsync(Replica replica, bool showName, CancellationToken cancellationToken)
|
||||
{
|
||||
_nameLabel.gameObject.SetActive(showName);
|
||||
await GetShowSequence().WithCancellation(cancellationToken);
|
||||
await TypeAsync(replica, cancellationToken);
|
||||
await UniTask.Delay(1000, cancellationToken: cancellationToken);
|
||||
await GetHideSequence().WithCancellation(cancellationToken);
|
||||
|
||||
_audioSource.Stop();
|
||||
_nameLabel.gameObject.SetActive(false);
|
||||
_textField.text = string.Empty;
|
||||
}
|
||||
|
||||
private async UniTask TypeAsync(Replica replica, CancellationToken cancellationToken)
|
||||
{
|
||||
string message = replica.text ?? string.Empty;
|
||||
|
||||
if (replica.clip != null)
|
||||
{
|
||||
_audioSource.clip = replica.clip;
|
||||
_audioSource.Play();
|
||||
SoundManager.instance.MusicFade(fadeDuration: 0.2f,
|
||||
holdDuration: replica.clip.length - 0.2f,
|
||||
targetVolumePercent: 0.5f);
|
||||
|
||||
if (SoundManager.instance != null)
|
||||
{
|
||||
SoundManager.instance.MusicFade(
|
||||
fadeDuration: 0.2f,
|
||||
holdDuration: Mathf.Max(replica.clip.length - 0.2f, 0f),
|
||||
targetVolumePercent: 0.5f);
|
||||
}
|
||||
}
|
||||
|
||||
float elapsed = 0;
|
||||
textField.text = string.Empty;
|
||||
float duration = replica.Duration;
|
||||
float elapsedTime = 0f;
|
||||
_textField.text = string.Empty;
|
||||
|
||||
while (elapsed < replica.Duration && ct.IsCancellationRequested == false)
|
||||
while (elapsedTime < duration && cancellationToken.IsCancellationRequested == false)
|
||||
{
|
||||
float percent = Mathf.Clamp01(elapsed / replica.Duration);
|
||||
int symbolsToShow = (int)(message.Length * percent);
|
||||
string text = message.Substring(0, symbolsToShow);
|
||||
float progress = Mathf.Clamp01(elapsedTime / duration);
|
||||
int symbolsToShow = Mathf.FloorToInt(message.Length * progress);
|
||||
_textField.text = message.Substring(0, symbolsToShow);
|
||||
|
||||
textField.text = text;
|
||||
|
||||
bool shouldPlayClip = typeClipLength != 0 && Time.time - lastTypeSoundTime > typeClipLength;
|
||||
if (shouldPlayClip)
|
||||
bool shouldPlayTypeClip = _typeClipLength > 0f && Time.time - _lastTypeSoundTime > _typeClipLength;
|
||||
if (shouldPlayTypeClip)
|
||||
{
|
||||
_audioSource.PlayOneShot(typeClip);
|
||||
lastTypeSoundTime = Time.time;
|
||||
_audioSource.PlayOneShot(_typeClip);
|
||||
_lastTypeSoundTime = Time.time;
|
||||
}
|
||||
|
||||
await UniTask.Yield(ct);
|
||||
elapsed += Time.deltaTime;
|
||||
await UniTask.Yield(cancellationToken);
|
||||
elapsedTime += Time.deltaTime;
|
||||
}
|
||||
|
||||
if (ct.IsCancellationRequested == false)
|
||||
{
|
||||
textField.text = message;
|
||||
}
|
||||
if (cancellationToken.IsCancellationRequested == false)
|
||||
_textField.text = message;
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
private void CancelCurrent()
|
||||
{
|
||||
if (_cts != null)
|
||||
if (_cancellationTokenSource != null && _cancellationTokenSource.IsCancellationRequested == false)
|
||||
_cancellationTokenSource.Cancel();
|
||||
}
|
||||
|
||||
private void SetOptimalFontSize(string message)
|
||||
{
|
||||
_textField.enableAutoSizing = false;
|
||||
|
||||
float minimumFontSize = Mathf.Min(_minimumFontSize, _maximumFontSize);
|
||||
float maximumFontSize = Mathf.Max(_minimumFontSize, _maximumFontSize);
|
||||
|
||||
if (string.IsNullOrEmpty(message))
|
||||
{
|
||||
_cts.Cancel();
|
||||
_cts.Dispose();
|
||||
_cts = null;
|
||||
_textField.fontSize = maximumFontSize;
|
||||
return;
|
||||
}
|
||||
nowTyping = false;
|
||||
textField.text = string.Empty;
|
||||
|
||||
Rect fieldRect = _textField.rectTransform.rect;
|
||||
Vector4 margin = _textField.margin;
|
||||
float availableWidth = Mathf.Max(fieldRect.width - margin.x - margin.z, 0.01f);
|
||||
float availableHeight = Mathf.Max(fieldRect.height - margin.y - margin.w, 0.01f);
|
||||
|
||||
for (int i = 0; i < _fontSizeSearchIterations; i++)
|
||||
{
|
||||
float candidateFontSize = (minimumFontSize + maximumFontSize) * 0.5f;
|
||||
_textField.fontSize = candidateFontSize;
|
||||
Vector2 preferredSize = _textField.GetPreferredValues(message, availableWidth, 0f);
|
||||
|
||||
if (preferredSize.x <= availableWidth && preferredSize.y <= availableHeight)
|
||||
minimumFontSize = candidateFontSize;
|
||||
else
|
||||
maximumFontSize = candidateFontSize;
|
||||
}
|
||||
|
||||
_textField.fontSize = minimumFontSize;
|
||||
}
|
||||
|
||||
private Sequence GetShowSequence()
|
||||
{
|
||||
Sequence seq = DOTween.Sequence();
|
||||
seq.Append(_frame.DOScale(1, 0.2f).SetEase(Ease.OutBack));
|
||||
return seq;
|
||||
Sequence sequence = DOTween.Sequence();
|
||||
sequence.Append(_frame.DOScale(_visibleScale, 0.2f).SetEase(Ease.OutBack));
|
||||
sequence.PlayForward();
|
||||
return sequence;
|
||||
}
|
||||
|
||||
private Sequence GetHideSequence()
|
||||
{
|
||||
Sequence seq = DOTween.Sequence();
|
||||
seq.Append(_frame.DOScale(0, 0.2f).SetEase(Ease.InBack));
|
||||
return seq;
|
||||
Sequence sequence = DOTween.Sequence();
|
||||
sequence.Append(_frame.DOScale(Vector3.zero, 0.2f).SetEase(Ease.InBack));
|
||||
sequence.PlayForward();
|
||||
return sequence;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ namespace CharacterSystem
|
||||
return false;
|
||||
}
|
||||
|
||||
return Random.Range(0f, 1f) < set.playProbability;
|
||||
return Random.Range(0f, 1f) < set.PlayProbability;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace CharacterSystem
|
||||
@ -7,23 +7,34 @@ namespace CharacterSystem
|
||||
public class ReplicasSet : ScriptableObject
|
||||
{
|
||||
public GameEvent type;
|
||||
[field: SerializeField, Range(0, 1)] public float playProbability { get; } = 1f;
|
||||
|
||||
[SerializeField] private List<Replica> _referenceList;
|
||||
|
||||
private List<Replica> _currentPool;
|
||||
|
||||
[field: SerializeField, Range(0f, 1f)] public float PlayProbability { get; private set; } = 1f;
|
||||
|
||||
public Replica GetNext()
|
||||
{
|
||||
if (_currentPool.Count == 0) Refill();
|
||||
if (_currentPool == null || _currentPool.Count == 0)
|
||||
Refill();
|
||||
|
||||
Replica item = _currentPool[^1]; // Берем последний элемент
|
||||
if (_currentPool.Count == 0)
|
||||
{
|
||||
Debug.LogError($"Набор реплик {name} пуст");
|
||||
return default;
|
||||
}
|
||||
|
||||
Replica item = _currentPool[^1];
|
||||
_currentPool.RemoveAt(_currentPool.Count - 1);
|
||||
return item;
|
||||
}
|
||||
|
||||
public void Refill()
|
||||
{
|
||||
_currentPool = new List<Replica>(_referenceList);
|
||||
_currentPool = _referenceList == null
|
||||
? new List<Replica>()
|
||||
: new List<Replica>(_referenceList);
|
||||
Shuffle(_currentPool);
|
||||
}
|
||||
|
||||
@ -36,4 +47,4 @@ namespace CharacterSystem
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
using UnityEngine;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
namespace CharacterSystem
|
||||
{
|
||||
@ -9,101 +9,111 @@ namespace CharacterSystem
|
||||
public Sprite icon;
|
||||
public Sprite iconSmall;
|
||||
public Sprite chipImage;
|
||||
|
||||
[SerializeField] private MessageBox _messageBox;
|
||||
[SerializeField] private ReplicasContainer replicas;
|
||||
|
||||
[SerializeField] private AudioSource _audioSource;
|
||||
[SerializeField] private Animator _animator;
|
||||
|
||||
public AnimationClip chipSpawningAnim;
|
||||
public AudioClip chipThrowClip;
|
||||
|
||||
[SerializeField] private MessageBox _messageBox;
|
||||
[SerializeField, FormerlySerializedAs("replicas")] private ReplicasContainer _replicas;
|
||||
[SerializeField] private AudioSource _audioSource;
|
||||
[SerializeField] private Animator _animator;
|
||||
|
||||
[Header("Анимация появление/убирание")]
|
||||
[SerializeField] private float showDuration = 1;
|
||||
[SerializeField] private float hideDuration = 1;
|
||||
[SerializeField] private Ease showEase = Ease.Linear;
|
||||
[SerializeField] private Ease hideEase = Ease.Linear;
|
||||
[SerializeField, FormerlySerializedAs("showDuration")] private float _showDuration = 1f;
|
||||
[SerializeField, FormerlySerializedAs("hideDuration")] private float _hideDuration = 1f;
|
||||
[SerializeField, FormerlySerializedAs("showEase")] private Ease _showEase = Ease.Linear;
|
||||
[SerializeField, FormerlySerializedAs("hideEase")] private Ease _hideEase = Ease.Linear;
|
||||
[SerializeField, FormerlySerializedAs("HiddenPos")] private Vector2 _hiddenPos;
|
||||
[SerializeField, FormerlySerializedAs("VisiblePos")] private Vector2 _visiblePos;
|
||||
|
||||
[SerializeField] private Vector2 HiddenPos;
|
||||
[SerializeField] private Vector2 VisiblePos;
|
||||
private void OnDestroy()
|
||||
{
|
||||
SettingsManager.OnSettingsChanged -= PullSettings;
|
||||
EventBus.OnGameEvent -= OnGameEvent;
|
||||
}
|
||||
|
||||
public void Initialize(string name)
|
||||
public void Initialize(string characterName)
|
||||
{
|
||||
SettingsManager.OnSettingsChanged += PullSettings;
|
||||
_audioSource = GetComponent<AudioSource>();
|
||||
PullSettings();
|
||||
replicas.Initialize();
|
||||
|
||||
transform.position = HiddenPos;
|
||||
if (_replicas != null)
|
||||
_replicas.Initialize();
|
||||
|
||||
transform.position = _hiddenPos;
|
||||
_animator.SetTrigger("PreAppear");
|
||||
_animator.enabled = false;
|
||||
|
||||
_messageBox.Initialize(name);
|
||||
}
|
||||
|
||||
private void PullSettings()
|
||||
{
|
||||
_audioSource.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME);
|
||||
if (_messageBox != null)
|
||||
_messageBox.Initialize(characterName);
|
||||
}
|
||||
|
||||
public Sequence GetShowSequence()
|
||||
{
|
||||
_animator.enabled = true;
|
||||
_animator.SetTrigger("PreAppear");
|
||||
EventBus.OnGameEvent -= OnGameEvent;
|
||||
EventBus.OnGameEvent += OnGameEvent;
|
||||
|
||||
Sequence seq = DOTween.Sequence();
|
||||
seq.Append(transform.DOMove(VisiblePos, showDuration).SetEase(showEase));
|
||||
|
||||
return seq;
|
||||
Sequence sequence = DOTween.Sequence();
|
||||
sequence.Append(transform.DOMove(_visiblePos, _showDuration).SetEase(_showEase));
|
||||
return sequence;
|
||||
}
|
||||
|
||||
public Sequence GetHideSequence()
|
||||
{
|
||||
EventBus.OnGameEvent -= OnGameEvent;
|
||||
_messageBox?.Stop();
|
||||
|
||||
Sequence seq = DOTween.Sequence();
|
||||
seq.Append(transform.DOMove(HiddenPos, hideDuration).SetEase(hideEase));
|
||||
seq.AppendCallback(() =>
|
||||
Sequence sequence = DOTween.Sequence();
|
||||
sequence.Append(transform.DOMove(_hiddenPos, _hideDuration).SetEase(_hideEase));
|
||||
sequence.AppendCallback(() =>
|
||||
{
|
||||
_animator.SetTrigger("PreAppear");
|
||||
_animator.enabled = false;
|
||||
});
|
||||
|
||||
return seq;
|
||||
return sequence;
|
||||
}
|
||||
|
||||
public void OnGameEvent(GameEvent gameEvent)
|
||||
{
|
||||
bool forceMessage = ReplicasContainer.ShouldForceMessage[gameEvent];
|
||||
bool shouldShowName = gameEvent == GameEvent.Appear;
|
||||
|
||||
Message(gameEvent, force: forceMessage, showName: shouldShowName);
|
||||
if (gameEvent == GameEvent.Appear)
|
||||
Message(gameEvent, forceMessage, shouldShowName);
|
||||
|
||||
if (gameEvent == GameEvent.Appear || gameEvent == GameEvent.Return)
|
||||
_animator.SetTrigger("Appear");
|
||||
|
||||
if (gameEvent == GameEvent.PlayerWin)
|
||||
_animator.SetTrigger("Lose");
|
||||
}
|
||||
|
||||
private void Message(GameEvent replicaType, bool force, bool showName = false)
|
||||
{
|
||||
if (replicas.WillPlay(replicaType) == false)
|
||||
return;
|
||||
|
||||
Replica replicaToPlay = replicas.GetNextReplica(replicaType);
|
||||
_messageBox.PlayReplica(replicaToPlay, force).Forget();
|
||||
}
|
||||
|
||||
public void InvokeThrowChip()
|
||||
=> SoundManager.instance.playClip(chipThrowClip);
|
||||
|
||||
public void ResetModule()
|
||||
{
|
||||
transform.position = HiddenPos;
|
||||
transform.position = _hiddenPos;
|
||||
_animator.SetTrigger("PreAppear");
|
||||
_animator.enabled = false;
|
||||
_audioSource.Stop();
|
||||
_messageBox.Stop();
|
||||
_messageBox?.Stop();
|
||||
}
|
||||
|
||||
private void PullSettings()
|
||||
{
|
||||
if (_audioSource != null)
|
||||
_audioSource.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME);
|
||||
}
|
||||
|
||||
private void Message(GameEvent replicaType, bool force, bool showName)
|
||||
{
|
||||
if (_replicas == null || _messageBox == null || _replicas.WillPlay(replicaType) == false)
|
||||
return;
|
||||
|
||||
Replica replica = _replicas.GetNextReplica(replicaType);
|
||||
_messageBox.PlayReplica(replica, force, showName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,40 +1,37 @@
|
||||
using DG.Tweening;
|
||||
using CharacterSystem;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
public class EndGameHandler : MonoBehaviour
|
||||
{
|
||||
[SerializeField] PveWinPanel winPanel;
|
||||
[SerializeField] PveLossPanel lossPanel;
|
||||
[SerializeField] PvpWinPanel pvpWinPanel;
|
||||
[SerializeField] PveLossPanel drawPanel;
|
||||
|
||||
[SerializeField, FormerlySerializedAs("winPanel")] private PveWinPanel _winPanel;
|
||||
[SerializeField, FormerlySerializedAs("lossPanel")] private PveLossPanel _lossPanel;
|
||||
[SerializeField, FormerlySerializedAs("pvpWinPanel")] private PvpWinPanel _pvpWinPanel;
|
||||
[SerializeField, FormerlySerializedAs("drawPanel")] private PveLossPanel _drawPanel;
|
||||
|
||||
public void HandleEndGame(Team lastPlayer, GameMode gameMode, CheckResult lastResult)
|
||||
{
|
||||
print("Конец игры");
|
||||
|
||||
|
||||
Debug.Log("Конец игры");
|
||||
GameManager.Instance.turnTracker.EnableTimer(false);
|
||||
|
||||
if (lastResult.Draw)
|
||||
DrawHandler(gameMode);
|
||||
else
|
||||
WinHandler(winner: lastPlayer,
|
||||
gameMode: gameMode,
|
||||
winChipsCoords: lastResult.WinningIndexes);
|
||||
|
||||
WinHandler(lastPlayer, gameMode, lastResult.WinningIndexes);
|
||||
}
|
||||
|
||||
private void DrawHandler(GameMode gameMode)
|
||||
{
|
||||
EventBus.TriggerEvent(GameEvent.Draw);
|
||||
|
||||
if (gameMode == GameMode.pve)
|
||||
drawPanel.Open(GameManager.Instance.ContinueAfterPveDraw);
|
||||
{
|
||||
EventBus.TriggerEvent(GameEvent.Draw);
|
||||
_drawPanel.Open(GameManager.Instance.ContinueAfterPveDraw);
|
||||
}
|
||||
else
|
||||
pvpWinPanel.Open();
|
||||
{
|
||||
_pvpWinPanel.Open();
|
||||
}
|
||||
}
|
||||
|
||||
private void WinHandler(Team winner, GameMode gameMode, HashSet<(int row, int col)> winChipsCoords)
|
||||
@ -42,32 +39,30 @@ public class EndGameHandler : MonoBehaviour
|
||||
Debug.Log($"Победа {winner}; Режим {gameMode}");
|
||||
PlayWinChipsAnimation(winChipsCoords);
|
||||
|
||||
if(gameMode == GameMode.pve)
|
||||
if (gameMode == GameMode.pve)
|
||||
{
|
||||
if(winner == Team.Player1)
|
||||
if (winner == Team.Player1)
|
||||
{
|
||||
EventBus.TriggerEvent(GameEvent.PlayerWin);
|
||||
winPanel.Open();
|
||||
}
|
||||
_winPanel.Open();
|
||||
}
|
||||
else
|
||||
{
|
||||
EventBus.TriggerEvent(GameEvent.BotWin);
|
||||
lossPanel.Open(GameManager.Instance.ContinueAfterPveLoss);
|
||||
_lossPanel.Open(GameManager.Instance.ContinueAfterPveLoss);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
pvpWinPanel.Open();
|
||||
_pvpWinPanel.Open();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void PlayWinChipsAnimation(HashSet<(int row, int col)> winChipsCoords)
|
||||
{
|
||||
Chip[,] grid = Board.Instance.Grid;
|
||||
|
||||
foreach (var winCoord in winChipsCoords)
|
||||
foreach ((int row, int col) winCoord in winChipsCoords)
|
||||
grid[winCoord.col, winCoord.row].WinAnimation();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,49 +1,51 @@
|
||||
using System;
|
||||
using CharacterSystem;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
public class TurnManager : MonoBehaviour
|
||||
{//todo: добавить отслеживание по таймеру
|
||||
{
|
||||
[Header("Players")]
|
||||
[SerializeField] private Player player1;
|
||||
[SerializeField] private Player player2;
|
||||
[SerializeField] private Bot bot;
|
||||
[SerializeField, FormerlySerializedAs("player1")] private Player _player1;
|
||||
[SerializeField, FormerlySerializedAs("player2")] private Player _player2;
|
||||
[SerializeField, FormerlySerializedAs("bot")] private Bot _bot;
|
||||
|
||||
[Header("Settings")]
|
||||
[SerializeField] private GameMode gameMode;
|
||||
[SerializeField, FormerlySerializedAs("gameMode")] private GameMode _gameMode;
|
||||
|
||||
private IGamePlayer currentPlayer;
|
||||
private bool isGameOver = false;
|
||||
private IGamePlayer _currentPlayer;
|
||||
private bool _isGameOver;
|
||||
|
||||
public void StartGame(GameMode mode)
|
||||
{
|
||||
gameMode = mode;
|
||||
isGameOver = false;
|
||||
_gameMode = mode;
|
||||
_isGameOver = false;
|
||||
SetupPlayers();
|
||||
StartTurn(currentPlayer);
|
||||
StartTurn(_currentPlayer);
|
||||
}
|
||||
|
||||
private void SetupPlayers()
|
||||
{
|
||||
// Всегда начинаем с первого игрока
|
||||
currentPlayer = player1;
|
||||
}
|
||||
=> _currentPlayer = _player1;
|
||||
|
||||
private void StartTurn(IGamePlayer player)
|
||||
{
|
||||
if (isGameOver) return;
|
||||
if (_isGameOver)
|
||||
return;
|
||||
|
||||
// Отписываемся, чтобы избежать дублирования подписок
|
||||
player.OnChipDropped -= OnTurnCompleted;
|
||||
player.OnChipDropped += OnTurnCompleted;
|
||||
player.PrepareChip();
|
||||
ControlsPerformer.Instance.SetControlable(player);
|
||||
currentPlayer = player;
|
||||
_currentPlayer = player;
|
||||
}
|
||||
|
||||
private void OnTurnCompleted(int column, int row)
|
||||
{
|
||||
// Отписываемся от события текущего игрока
|
||||
currentPlayer.OnChipDropped -= OnTurnCompleted;
|
||||
IGamePlayer completedPlayer = _currentPlayer;
|
||||
completedPlayer.OnChipDropped -= OnTurnCompleted;
|
||||
|
||||
if (_gameMode == GameMode.pve && completedPlayer == _player1)
|
||||
EventBus.TriggerEvent(GameEvent.PlayerTurn);
|
||||
|
||||
if (CheckGameOver(column, row))
|
||||
{
|
||||
@ -56,46 +58,38 @@ public class TurnManager : MonoBehaviour
|
||||
|
||||
private void NextTurn()
|
||||
{
|
||||
// Отключаем текущего игрока
|
||||
currentPlayer.Sleep();
|
||||
_currentPlayer.Sleep();
|
||||
|
||||
// Определяем следующего игрока в зависимости от режима
|
||||
IGamePlayer nextPlayer;
|
||||
if (gameMode == GameMode.pve)
|
||||
{
|
||||
nextPlayer = (currentPlayer == player1) ? (IGamePlayer)bot : player1;
|
||||
}
|
||||
else // pvp
|
||||
{
|
||||
nextPlayer = (currentPlayer == player1) ? (IGamePlayer)player2 : player1;
|
||||
}
|
||||
if (_gameMode == GameMode.pve)
|
||||
_currentPlayer = _currentPlayer == _player1 ? (IGamePlayer)_bot : _player1;
|
||||
else
|
||||
_currentPlayer = _currentPlayer == _player1 ? (IGamePlayer)_player2 : _player1;
|
||||
|
||||
currentPlayer = nextPlayer;
|
||||
StartTurn(currentPlayer);
|
||||
StartTurn(_currentPlayer);
|
||||
|
||||
if (_gameMode == GameMode.pve && _currentPlayer == _bot)
|
||||
EventBus.TriggerEvent(GameEvent.BotTurn);
|
||||
}
|
||||
|
||||
private bool CheckGameOver(int column, int row)
|
||||
{
|
||||
if(currentPlayer is BasePlayer player)
|
||||
if (_currentPlayer is BasePlayer player)
|
||||
{
|
||||
var checkResult = FieldChecker.Check(player.team, row, column);
|
||||
CheckResult checkResult = FieldChecker.Check(player.team, row, column);
|
||||
return checkResult.End;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception($"Не удалось привести {currentPlayer}");
|
||||
}
|
||||
|
||||
throw new Exception($"Не удалось привести {_currentPlayer}");
|
||||
}
|
||||
|
||||
private void OnGameOver()
|
||||
{
|
||||
isGameOver = true;
|
||||
currentPlayer.Sleep();
|
||||
|
||||
_isGameOver = true;
|
||||
_currentPlayer.Sleep();
|
||||
ControlsPerformer.Instance.SetControlable(null);
|
||||
Team lastPlayerTeam = ((BasePlayer)currentPlayer).team;
|
||||
var result = FieldChecker.lastResult;
|
||||
|
||||
GameManager.Instance.endGameHandler.HandleEndGame(lastPlayerTeam, gameMode, result);
|
||||
|
||||
Team lastPlayerTeam = ((BasePlayer)_currentPlayer).team;
|
||||
CheckResult result = FieldChecker.lastResult;
|
||||
GameManager.Instance.endGameHandler.HandleEndGame(lastPlayerTeam, _gameMode, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -519,8 +519,8 @@ TextureImporter:
|
||||
y: 450
|
||||
width: 1240
|
||||
height: 942
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
alignment: 9
|
||||
pivot: {x: 0.2272139, y: 0.014836305}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user