결과 화면 작업 중..., 흔듦 적용안되는 거 수정
This commit is contained in:
parent
63d8c546e6
commit
016ea0484c
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\uBA54\uC778\uD654\uBA74"
|
||||
m_text: "\uC9C4\uD589"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2}
|
||||
|
|
@ -432,7 +432,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\uB2E4\uC74C\uD310"
|
||||
m_text: "\uC2B9\uB9AC"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2}
|
||||
|
|
|
|||
|
|
@ -240,8 +240,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7238888999980610810}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1448176182425009464}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
|
@ -1727,6 +1726,7 @@ GameObject:
|
|||
- component: {fileID: 3284139348423762702}
|
||||
- component: {fileID: 3284139348423762703}
|
||||
- component: {fileID: 3284139348423762701}
|
||||
- component: {fileID: 6042027882932108988}
|
||||
- component: {fileID: 7669909922397149234}
|
||||
- component: {fileID: 4454672199754287793}
|
||||
m_Layer: 5
|
||||
|
|
@ -1817,6 +1817,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 117aacfc364decd44a545ec21a47dd2a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ResultxList: {fileID: 6042027882932108988}
|
||||
gos_bankrupt:
|
||||
- {fileID: 1807920661781396425}
|
||||
- {fileID: 710497735635010267}
|
||||
|
|
@ -1829,7 +1830,7 @@ MonoBehaviour:
|
|||
t_mygold: {fileID: 7411662397727388600}
|
||||
ButtonlabelTMP: {fileID: 3770223039640337273}
|
||||
DetailTMP: {fileID: 5135471493991320889}
|
||||
DetailButtonGO: {fileID: 6793896567168727719}
|
||||
DetailButtonGO: {fileID: 0}
|
||||
NormalGameObjects:
|
||||
- {fileID: 3770223041487189102}
|
||||
- {fileID: 3770223040031960071}
|
||||
|
|
@ -1841,6 +1842,21 @@ MonoBehaviour:
|
|||
GetHeartPanel: {fileID: 5581418180039721964}
|
||||
ForcedMoveButtonGO: {fileID: 5749175402697926389}
|
||||
NextGameButtonTMP: {fileID: 2633950823624713819}
|
||||
--- !u!114 &6042027882932108988
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3284139348423762692}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4c32075154670e748be90eff74160754, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ScrollRect: {fileID: 0}
|
||||
m_Content: {fileID: 830337400189707156}
|
||||
go_card: {fileID: 5582549817130953831, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
--- !u!225 &7669909922397149234
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4616,112 +4632,6 @@ MonoBehaviour:
|
|||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6793896567168727719
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2670277804082820303}
|
||||
- component: {fileID: 4828057723395833198}
|
||||
- component: {fileID: 438123003476560781}
|
||||
- component: {fileID: 5298733675206535375}
|
||||
m_Layer: 5
|
||||
m_Name: DetailButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2670277804082820303
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6793896567168727719}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4341770361503659572}
|
||||
m_Father: {fileID: 7620317501339891315}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -258, y: -126}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4828057723395833198
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6793896567168727719}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &438123003476560781
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6793896567168727719}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 6facc842ead05744184e7db7ba064b48, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1.93
|
||||
--- !u!114 &5298733675206535375
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6793896567168727719}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 14a02640485dabf4d8eeab6b8d0e1f37, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Delegates:
|
||||
- eventID: 4
|
||||
callback:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 3284139348423762701}
|
||||
m_TargetAssemblyTypeName: ResultPopup, Assembly-CSharp
|
||||
m_MethodName: DetailToggle
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &7084743047453854043
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4757,7 +4667,6 @@ RectTransform:
|
|||
- {fileID: 1327761081970033363}
|
||||
- {fileID: 5230557969959556997}
|
||||
- {fileID: 7068876715753499912}
|
||||
- {fileID: 2670277804082820303}
|
||||
m_Father: {fileID: 3770223040128328972}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -4910,142 +4819,6 @@ MonoBehaviour:
|
|||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &7314677554203338002
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4341770361503659572}
|
||||
- component: {fileID: 3417564527825578142}
|
||||
- component: {fileID: 790450405273187849}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4341770361503659572
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7314677554203338002}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2670277804082820303}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 3}
|
||||
m_SizeDelta: {x: 100, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3417564527825578142
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7314677554203338002}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &790450405273187849
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7314677554203338002}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\uC0C1\uC138"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 27
|
||||
m_fontSizeBase: 27
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 0
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures:
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 0
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 0
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 0
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &7633155827194241694
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5334,105 +5107,3 @@ MonoBehaviour:
|
|||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1001 &7653161633284968769
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3718319660958738714}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5582549817130953831, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: resultxinfocard
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
--- !u!224 &7238888999980610810 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1027048056866661819, guid: 0d0c9396478cbd94f8a62219f900df87, type: 3}
|
||||
m_PrefabInstance: {fileID: 7653161633284968769}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -72098,7 +72098,8 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
aiImage: {fileID: 922729938}
|
||||
TargetLevelIndexTMP: {fileID: 638013397}
|
||||
TargetLevelIndexTMP: {fileID: 933070233}
|
||||
t_point: {fileID: 1087037063}
|
||||
adviceTMP: {fileID: 1585505910}
|
||||
PrologueEventID: PmzAlj6y80GEP94KMgPTfA
|
||||
speechBubbleNomalText:
|
||||
|
|
|
|||
|
|
@ -440,7 +440,6 @@ public partial class GamePanel : MonoBehaviour
|
|||
int ai_Ghwang = GetScoreBoardTypeNumber(false, ECardScoreType.Ghwang);
|
||||
|
||||
|
||||
// <20><><EFBFBD><EFBFBD>, <20>ǹ<EFBFBD>, <20><><EFBFBD><EFBFBD> üũ
|
||||
if (isPlayerWon)
|
||||
{
|
||||
if (AI_Go > 0)
|
||||
|
|
@ -458,6 +457,11 @@ public partial class GamePanel : MonoBehaviour
|
|||
if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Gwhangbak) == false)
|
||||
_hashScoreMultiplyTypes.Add(EScoreMutiplyType.Gwhangbak);
|
||||
}
|
||||
if (Player_Bell > 0)
|
||||
{
|
||||
if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Shake) == false)
|
||||
_hashScoreMultiplyTypes.Add(EScoreMutiplyType.Shake);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -476,6 +480,11 @@ public partial class GamePanel : MonoBehaviour
|
|||
if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Gwhangbak) == false)
|
||||
_hashScoreMultiplyTypes.Add(EScoreMutiplyType.Gwhangbak);
|
||||
}
|
||||
if (AI_Bell > 0)
|
||||
{
|
||||
if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Shake) == false)
|
||||
_hashScoreMultiplyTypes.Add(EScoreMutiplyType.Shake);
|
||||
}
|
||||
}
|
||||
|
||||
if (_hashScoreMultiplyTypes.Count <= 0)
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class HuntingSlot : CardBase
|
|||
texts_price[0].text = _data_left.NeedKey.ToString();
|
||||
texts_price[1].text = _data_right.NeedHeart.ToString();
|
||||
texts[0].text = $"Lv.{_data_left.NeedLv}";
|
||||
texts[1].text = $"점 {"???"}";
|
||||
texts[1].text = $"점 {_data_left.NeedLv * DBManager.NORMAL_GAME_STAKE_PER_LEVEL}";
|
||||
|
||||
_huntigdata_left = DB_HuntingData.GetEntity(new BansheeGz.BGDatabase.BGId(_data_left.HuntingDataID));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using DG.Tweening;
|
||||
using TMPro;
|
||||
using System;
|
||||
using CodeJay.Defines;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
public class MainPanel : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private UnityEngine.UI.Image aiImage;
|
||||
[SerializeField] private TMPro.TextMeshProUGUI TargetLevelIndexTMP;
|
||||
[SerializeField] private TextMeshProUGUI TargetLevelIndexTMP, t_point;
|
||||
[SerializeField] private TextMeshProUGUI adviceTMP;
|
||||
|
||||
[SerializeField] private string PrologueEventID;
|
||||
|
|
@ -120,7 +118,8 @@ public class MainPanel : MonoBehaviour
|
|||
|
||||
private void OnSynchronizeNormalGameData()
|
||||
{
|
||||
TargetLevelIndexTMP.text = GameManager.DB.NormalGameLevel.ToString();
|
||||
TargetLevelIndexTMP.text = $"Lv.{GameManager.DB.NormalGameLevel}";
|
||||
t_point.text = $"{GameManager.DB.NormalGameLevel * DBManager.NORMAL_GAME_STAKE_PER_LEVEL}";
|
||||
}
|
||||
|
||||
public void ClickStartGame()
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using UnityEngine.UI;
|
|||
|
||||
public class ResultPopup : PopupBase
|
||||
{
|
||||
public ResultxList m_ResultxList;
|
||||
public GameObject[] gos_bankrupt; // 0 상대 파산, 1 내가 파산
|
||||
public GameObject[] gos_result; // 0 승리, 1 패배
|
||||
public TextMeshProUGUI t_Cal;
|
||||
|
|
@ -16,7 +17,6 @@ public class ResultPopup : PopupBase
|
|||
|
||||
[SerializeField] private TextMeshProUGUI ButtonlabelTMP;
|
||||
[SerializeField] private TextMeshProUGUI DetailTMP;
|
||||
[SerializeField] private GameObject DetailButtonGO;
|
||||
|
||||
[SerializeField] private GameObject[] NormalGameObjects;
|
||||
[SerializeField] private GameObject[] ClearChallengeObjects;
|
||||
|
|
@ -88,7 +88,8 @@ public class ResultPopup : PopupBase
|
|||
DSUtil.InActivateGameObjects(gos_bankrupt);
|
||||
GoldTMP.enabled = true;
|
||||
DetailTMP.enabled = false;
|
||||
DetailButtonGO.SetActive(true);
|
||||
|
||||
list_xinfo.ForEach(f => f.mul = 0); // 초기화
|
||||
|
||||
DetailTMP.text = GamePanel.Instance.GetDetailString(_gameResult);
|
||||
|
||||
|
|
@ -102,7 +103,7 @@ public class ResultPopup : PopupBase
|
|||
}
|
||||
|
||||
if (gameResult)
|
||||
{
|
||||
{ // win
|
||||
ButtonlabelTMP.text = "다음판 <size=40><color=yellow>2배</color></size>";
|
||||
|
||||
if (fixedScore <= 0)
|
||||
|
|
@ -136,12 +137,11 @@ public class ResultPopup : PopupBase
|
|||
if (multiply <= 0)
|
||||
multiply = 1;
|
||||
|
||||
var val = CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]);
|
||||
if (multipleType[i] == EScoreMutiplyType.Shake)
|
||||
multiply *= CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]) * GamePanel.Instance.Player_Bell;
|
||||
else
|
||||
multiply *= CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]);
|
||||
|
||||
list_xinfo.Find(f=>f.type == multipleType[i]).mul = multiply;
|
||||
val *= GamePanel.Instance.Player_Bell;
|
||||
multiply *= val;
|
||||
list_xinfo.Find(f => f.type == multipleType[i]).mul = val;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ public class ResultPopup : PopupBase
|
|||
}
|
||||
else
|
||||
{
|
||||
t_Cal.text = str + $" =\n총 {score}점\n";
|
||||
t_Cal.text = str + $" \n= 총 {score}점\n";
|
||||
_resultTotalGold = score * GamePanel.Instance.Stake;
|
||||
}
|
||||
|
||||
|
|
@ -176,7 +176,7 @@ public class ResultPopup : PopupBase
|
|||
else
|
||||
{
|
||||
_resultTotalGold = GamePanel.Instance.Stake * fixedScore;
|
||||
t_Cal.text = $"{fixedScore}점 =\n총 {fixedScore}점\n";
|
||||
t_Cal.text = $"{fixedScore}점 \n= 총 {fixedScore}점\n";
|
||||
}
|
||||
|
||||
t_Cal.text += $"x {GamePanel.Instance.Stake}냥";
|
||||
|
|
@ -255,9 +255,8 @@ public class ResultPopup : PopupBase
|
|||
|
||||
//ForcedMoveButtonGO.SetActive(false);
|
||||
}
|
||||
// <20>й<EFBFBD>
|
||||
else
|
||||
{
|
||||
{ // lose
|
||||
GetHeartPanel.SetActive(false);
|
||||
|
||||
GameManager.Sound.PlaySFX(ESFXType.Lose);
|
||||
|
|
@ -297,10 +296,11 @@ public class ResultPopup : PopupBase
|
|||
if (multiply <= 0)
|
||||
multiply = 1;
|
||||
|
||||
var val = CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]);
|
||||
if (multipleType[i] == EScoreMutiplyType.Shake)
|
||||
multiply *= CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]) * GamePanel.Instance.AI_Bell;
|
||||
else
|
||||
multiply *= CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]);
|
||||
val *= GamePanel.Instance.AI_Bell;
|
||||
multiply *= val;
|
||||
list_xinfo.Find(f => f.type == multipleType[i]).mul = val;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -311,20 +311,20 @@ public class ResultPopup : PopupBase
|
|||
if (multiply > goNumer - 1)
|
||||
{
|
||||
int withoutGoMultiply = multiply / (goNumer - 1);
|
||||
t_Cal.text = str + $" x {withoutGoMultiply}배 =\n총 {score * multiply}점";
|
||||
t_Cal.text = str + $" x {withoutGoMultiply}배\n= 총 {score * multiply}점";
|
||||
}
|
||||
else
|
||||
{
|
||||
t_Cal.text = str + $" x {goNumer}고(x{goNumer - 1}) =\n총 {score * multiply}점";
|
||||
t_Cal.text = str + $" x {goNumer}고(x{goNumer - 1})\n= 총 {score * multiply}점";
|
||||
}
|
||||
}
|
||||
else
|
||||
t_Cal.text = str + $" x {multiply}배 =\n총 {score * multiply}점";
|
||||
t_Cal.text = str + $" x {multiply}배\n= 총 {score * multiply}점";
|
||||
_resultTotalGold = score * multiply * GamePanel.Instance.Stake;
|
||||
}
|
||||
else
|
||||
{
|
||||
t_Cal.text = str + $" =\n총 {score}점";
|
||||
t_Cal.text = str + $"\n= 총 {score}점";
|
||||
_resultTotalGold = score * GamePanel.Instance.Stake;
|
||||
}
|
||||
|
||||
|
|
@ -332,7 +332,7 @@ public class ResultPopup : PopupBase
|
|||
else
|
||||
{
|
||||
_resultTotalGold = GamePanel.Instance.Stake * fixedScore;
|
||||
t_Cal.text = $"{fixedScore}점 =\n총 {fixedScore}점";
|
||||
t_Cal.text = $"{fixedScore}점\n= 총 {fixedScore}점";
|
||||
}
|
||||
|
||||
GoldTMP.text = "-" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold);
|
||||
|
|
@ -364,7 +364,8 @@ public class ResultPopup : PopupBase
|
|||
}
|
||||
}
|
||||
|
||||
t_enemygold.text = CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.GetRemainigNormalGameAIGold());
|
||||
m_ResultxList.Set(list_xinfo);
|
||||
t_enemygold.text = gos_bankrupt[0].activeSelf ? "0냥" : CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.GetRemainigNormalGameAIGold());
|
||||
t_mygold.text = CodeJay.CodeJayUtility.Converter.MoneyToString(GameManager.DB.Gold);
|
||||
|
||||
GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold);
|
||||
|
|
@ -376,14 +377,13 @@ public class ResultPopup : PopupBase
|
|||
{
|
||||
GoldTMP.enabled = true;
|
||||
DetailTMP.enabled = false;
|
||||
DetailButtonGO.SetActive(false);
|
||||
ForcedMoveButtonGO.SetActive(false);
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win);
|
||||
|
||||
DSUtil.InActivateGameObjects(gos_result, 0);
|
||||
|
||||
_resultTotalGold = resultGold;
|
||||
t_Cal.text = "7점 = 총 7점";
|
||||
t_Cal.text = $"7점\n= 총 7점\nx {GamePanel.Instance.Stake}냥";
|
||||
|
||||
GoldTMP.text = "+" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,26 +2,29 @@ using TMPro;
|
|||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ResultxInfoCard : MonoBehaviour
|
||||
public class ResultxInfoCard : CardBase
|
||||
{
|
||||
public Image i_bg;
|
||||
public TextMeshProUGUI t_title_on, t_title_off, t_x;
|
||||
public Sprite sprite_on, sprite_off;
|
||||
|
||||
public void Set(string title, int x)
|
||||
public override void Set<T>(T _base, int iLoop = -1, int idata = -1)
|
||||
{
|
||||
if (x > 1)
|
||||
base.Set(_base, iLoop, idata);
|
||||
var data = _base as ResultxInfoData;
|
||||
|
||||
if (data.mul > 1)
|
||||
{
|
||||
i_bg.sprite = sprite_on;
|
||||
t_title_off.text = "";
|
||||
t_title_on.text = title;
|
||||
t_x.text = $"x{x}";
|
||||
t_title_on.text = data.name;
|
||||
t_x.text = $"x{data.mul}";
|
||||
}
|
||||
else
|
||||
{
|
||||
i_bg.sprite = sprite_off;
|
||||
t_title_off.text = title;
|
||||
t_x.text = "";
|
||||
t_title_off.text = data.name;
|
||||
t_title_on.text = t_x.text = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
using System.Collections.Generic;
|
||||
|
||||
public class ResultxList : uScrollViewMgr
|
||||
{
|
||||
public void Set(List<ResultxInfoData> lst)
|
||||
{
|
||||
Set_ScrollView(lst);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4c32075154670e748be90eff74160754
|
||||
Loading…
Reference in New Issue