노티 제외 완료, 스킬 갯수 추가
This commit is contained in:
parent
1685c9dc49
commit
ccc81d3d36
|
|
@ -87,7 +87,7 @@ messageinfo 엄청 느린 버그
|
|||
|
||||
상점
|
||||
|
||||
장비 착용 에러 수정하자
|
||||
|
||||
뽑기
|
||||
- 방어구, 장신구, 스킬
|
||||
- 반복 보상 노티
|
||||
- 장비(100회), 스킬(200회) 마다 설정된 장비 중 하나 선택해서 획득 (횟수)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
[{"n_ID": "10001", "n_Title": "290", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "50", "n_GachaGoodsID": "1", "n_GachaTicketID": "401", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "30001", "n_PickupReward": "20001", "n_RepeatRewardPoint": "100"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "40", "n_GachaGoodsID": "1", "n_GachaTicketID": "402", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "40002", "n_PickupReward": "20002", "n_RepeatRewardPoint": "100"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "30", "n_GachaGoodsID": "1", "n_GachaTicketID": "403", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "40003", "n_PickupReward": "20003", "n_RepeatRewardPoint": "100"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "", "b_StageLv": "False", "n_GachaPrice": "100", "n_GachaGoodsID": "1", "n_GachaTicketID": "404", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "40004", "n_PickupReward": "20004", "n_RepeatRewardPoint": "200"}]
|
||||
[{"n_ID": "10001", "n_Title": "290", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "50", "n_GachaGoodsID": "1", "n_GachaTicketID": "401", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "30001", "n_PickupReward": "20001", "n_RepeatRewardPoint": "100"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "40", "n_GachaGoodsID": "1", "n_GachaTicketID": "402", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "30002", "n_PickupReward": "20002", "n_RepeatRewardPoint": "100"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "30", "n_GachaGoodsID": "1", "n_GachaTicketID": "403", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "30003", "n_PickupReward": "20003", "n_RepeatRewardPoint": "100"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "", "b_StageLv": "False", "n_GachaPrice": "100", "n_GachaGoodsID": "1", "n_GachaTicketID": "404", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "30004", "n_PickupReward": "20004", "n_RepeatRewardPoint": "200"}]
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -389,7 +389,19 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 3135099708992604725}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 8021243398181034708}
|
||||
m_TargetAssemblyTypeName: GachaRewardCard, Assembly-CSharp
|
||||
m_MethodName: OnClick_Check
|
||||
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!114 &7249779961206219826
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -13311,6 +13311,96 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1023771392432929949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1308800734028803148}
|
||||
- component: {fileID: 8523533710016408063}
|
||||
- component: {fileID: 3798615700600214220}
|
||||
- component: {fileID: 3163840482678963003}
|
||||
m_Layer: 5
|
||||
m_Name: Viewport
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1308800734028803148
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1023771392432929949}
|
||||
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: 1101932381606295256}
|
||||
m_Father: {fileID: 825762371881181045}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8523533710016408063
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1023771392432929949}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3798615700600214220
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1023771392432929949}
|
||||
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: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &3163840482678963003
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1023771392432929949}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowMaskGraphic: 0
|
||||
--- !u!1 &1040353544189859471
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13959,96 +14049,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_localtextKey: 330
|
||||
--- !u!1 &1079645259790442059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4501828702904700585}
|
||||
- component: {fileID: 6323039651430933429}
|
||||
- component: {fileID: 1684496905633870529}
|
||||
- component: {fileID: 7891017879774711162}
|
||||
m_Layer: 5
|
||||
m_Name: Viewport
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4501828702904700585
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1079645259790442059}
|
||||
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: 5690960419925106529}
|
||||
m_Father: {fileID: 5315389758405065539}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &6323039651430933429
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1079645259790442059}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1684496905633870529
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1079645259790442059}
|
||||
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: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7891017879774711162
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1079645259790442059}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowMaskGraphic: 0
|
||||
--- !u!1 &1090797489894845170
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -14353,6 +14353,83 @@ MonoBehaviour:
|
|||
m_PCLimitUI_Left: {fileID: 6358502721467264375}
|
||||
m_PCLimit_Center: {fileID: 4721805207211312123}
|
||||
m_PCLimitUI_Right: {fileID: 2191533203116175526}
|
||||
--- !u!1 &1119811186805277784
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1101932381606295256}
|
||||
- component: {fileID: 8142857693003205841}
|
||||
- component: {fileID: 134336033021408636}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1101932381606295256
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1119811186805277784}
|
||||
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: 1308800734028803148}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -19}
|
||||
m_SizeDelta: {x: -1200, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &8142857693003205841
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1119811186805277784}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!114 &134336033021408636
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1119811186805277784}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 50
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &1121158146312420198
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -17919,82 +17996,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_localtextKey: 352
|
||||
--- !u!1 &1344730065394996979
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5315389758405065539}
|
||||
- component: {fileID: 7029277971579444830}
|
||||
- component: {fileID: 7107704396458737097}
|
||||
m_Layer: 5
|
||||
m_Name: scrollview_
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5315389758405065539
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1344730065394996979}
|
||||
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: 4501828702904700585}
|
||||
m_Father: {fileID: 359588738993368440}
|
||||
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: 46.660004}
|
||||
m_SizeDelta: {x: -40, y: -293.33}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7029277971579444830
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1344730065394996979}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7107704396458737097
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1344730065394996979}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 5690960419925106529}
|
||||
m_Horizontal: 1
|
||||
m_Vertical: 0
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 4501828702904700585}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: 0
|
||||
m_VerticalScrollbarSpacing: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &1353827027831785723
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18845,7 +18846,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: dab8a0a05e3bcf3409aaf79e858e227b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ScrollRect: {fileID: 7107704396458737097}
|
||||
m_ScrollRect: {fileID: 8711499359510489565}
|
||||
m_Content: {fileID: 0}
|
||||
go_card: {fileID: 2677768981232683649, guid: edd4387f57da76749ac2b377f61d03ba, type: 3}
|
||||
--- !u!1 &1443122066565622588
|
||||
|
|
@ -26840,83 +26841,6 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1946115681367285629
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5690960419925106529}
|
||||
- component: {fileID: 3352708418162335652}
|
||||
- component: {fileID: 744074336714717806}
|
||||
m_Layer: 5
|
||||
m_Name: layout
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5690960419925106529
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1946115681367285629}
|
||||
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: 4501828702904700585}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3352708418162335652
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1946115681367285629}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 50
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &744074336714717806
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1946115681367285629}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &1947604125355514274
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -103102,6 +103026,82 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7708969506521958892
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 825762371881181045}
|
||||
- component: {fileID: 4072591758056369781}
|
||||
- component: {fileID: 8711499359510489565}
|
||||
m_Layer: 5
|
||||
m_Name: scrollview_
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &825762371881181045
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7708969506521958892}
|
||||
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: 1308800734028803148}
|
||||
m_Father: {fileID: 359588738993368440}
|
||||
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: 45.47}
|
||||
m_SizeDelta: {x: 0, y: -290.94}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4072591758056369781
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7708969506521958892}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8711499359510489565
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7708969506521958892}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 1101932381606295256}
|
||||
m_Horizontal: 1
|
||||
m_Vertical: 0
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 1308800734028803148}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: 0
|
||||
m_VerticalScrollbarSpacing: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7709451597704839079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -108749,7 +108749,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4871129892051347898}
|
||||
- {fileID: 5315389758405065539}
|
||||
- {fileID: 825762371881181045}
|
||||
- {fileID: 3968996966833225675}
|
||||
m_Father: {fileID: 7202680468911644025}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public partial class ServerData
|
|||
/// </summary>
|
||||
public Dictionary<string, List<ObscuredDouble>> Enchant = new Dictionary<string, List<ObscuredDouble>>();
|
||||
/// <summary>
|
||||
/// { ID, 0 레벨, 1 각성 }
|
||||
/// { ID, 0 갯수, 1 레벨, 2 각성 }
|
||||
/// </summary>
|
||||
public Dictionary<string, List<ObscuredInt>> Skill = new Dictionary<string, List<ObscuredInt>>();
|
||||
public Dictionary<string, ObscuredInt> Ability = new Dictionary<string, ObscuredInt>();
|
||||
|
|
@ -495,12 +495,12 @@ public partial class ServerData
|
|||
int Get_SkillLv(int _skillid)
|
||||
{
|
||||
var key = Get_Key(_skillid);
|
||||
return Skill.ContainsKey(key) ? Skill[key][0] : 0;
|
||||
return Skill.ContainsKey(key) ? Skill[key][1] : 0;
|
||||
}
|
||||
public int Get_SkillAwakenLv(int _skillid)
|
||||
{
|
||||
var key = Get_Key(_skillid);
|
||||
return Skill.ContainsKey(key) ? Skill[key][1] : 0;
|
||||
return Skill.ContainsKey(key) ? Skill[key][2] : 0;
|
||||
}
|
||||
public int Get_PetSkillAwakenLv(int petid)
|
||||
{
|
||||
|
|
@ -513,21 +513,37 @@ public partial class ServerData
|
|||
return 1;
|
||||
return 0;
|
||||
}
|
||||
public void Add_Skill(int _skillid, int amount)
|
||||
{
|
||||
var key = Get_Key(_skillid);
|
||||
if (!Skill.ContainsKey(key))
|
||||
{
|
||||
Skill.Add(key, new List<ObscuredInt> { 0, 0, 0 });
|
||||
Add_SkillLv(_skillid, 1);
|
||||
--amount;
|
||||
}
|
||||
|
||||
if (amount > 0)
|
||||
{
|
||||
Skill[key][0] += amount;
|
||||
Skill[key][0].RandomizeCryptoKey();
|
||||
}
|
||||
}
|
||||
public void Add_SkillLv(int _skillid, int _lv = 1)
|
||||
{
|
||||
var key = Get_Key(_skillid);
|
||||
if (!Skill.ContainsKey(key))
|
||||
Skill.Add(key, new List<ObscuredInt> { 0, 0 });
|
||||
Skill[key][0] += _lv;
|
||||
Skill[key][0].RandomizeCryptoKey();
|
||||
Skill.Add(key, new List<ObscuredInt> { 0, 0, 0 });
|
||||
Skill[key][1] += _lv;
|
||||
Skill[key][1].RandomizeCryptoKey();
|
||||
}
|
||||
public void Add_SkillAwakenLv(int _skillid)
|
||||
{
|
||||
var key = Get_Key(_skillid);
|
||||
if (!Skill.ContainsKey(key))
|
||||
Skill.Add(key, new List<ObscuredInt> { 0, 0 });
|
||||
++Skill[key][1];
|
||||
Skill[key][1].RandomizeCryptoKey();
|
||||
Skill.Add(key, new List<ObscuredInt> { 0, 0, 0 });
|
||||
++Skill[key][2];
|
||||
Skill[key][2].RandomizeCryptoKey();
|
||||
}
|
||||
#endregion
|
||||
#region 장비 (무기, 갑옷, 장갑, 신발, 목걸이, 반지)
|
||||
|
|
@ -1911,6 +1927,8 @@ public partial class ServerData
|
|||
Equipment[key][1].RandomizeCryptoKey();
|
||||
break;
|
||||
|
||||
case eItem.Skill: Add_Skill(id, (int)amount); break;
|
||||
|
||||
case eItem.PC:
|
||||
PC.Add_PC(id);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,52 @@
|
|||
using CodeStage.AntiCheat.ObscuredTypes;
|
||||
|
||||
public class GachaRepeatReward : uScrollViewMgr
|
||||
{
|
||||
GachaConfigTableData m_Data;
|
||||
ObscuredInt SelectID;
|
||||
int m_SelectID
|
||||
{
|
||||
get { return SelectID; }
|
||||
set
|
||||
{
|
||||
SelectID = value;
|
||||
SelectID.RandomizeCryptoKey();
|
||||
}
|
||||
}
|
||||
|
||||
public void Set(GachaConfigTableData data)
|
||||
{
|
||||
base.Set();
|
||||
m_Data = data;
|
||||
m_SelectID = 0;
|
||||
Set_UI();
|
||||
}
|
||||
|
||||
public override void Set_UI()
|
||||
{
|
||||
Set_ScrollView(table_gacharandombag.Ins.Get_DataList(m_Data.n_PickupReward, 0));
|
||||
}
|
||||
|
||||
public void Select_Item(int id)
|
||||
{
|
||||
SelectID = id;
|
||||
list_CardBase.ForEach(f => f.Set(id));
|
||||
}
|
||||
|
||||
public void OnClick_Get()
|
||||
{
|
||||
|
||||
if (m_SelectID > 0)
|
||||
{
|
||||
var sdata = ServerInfo.Ins.m_ServerData;
|
||||
if (sdata.Get_GachaPoint(m_Data.n_ID) >= m_Data.n_RepeatRewardPoint)
|
||||
{
|
||||
sdata.Use_GachaPoint(m_Data.n_ID, m_Data.n_RepeatRewardPoint);
|
||||
var item = new ItemSimpleData { itemid = m_SelectID, amount = 1 };
|
||||
sdata.Add_Item(item.itemid, item.amount);
|
||||
ObtainItemUI.Ins.Set(item);
|
||||
NewGameUI.Ins.m_GachaUI.m_gachaBase.Set_UI();
|
||||
OnClick_Back();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -20,4 +20,14 @@ public class GachaRewardCard : CardBase
|
|||
texts[0].text = "1";
|
||||
gos[0].SetActive(false);
|
||||
}
|
||||
|
||||
public override void Set(int _val)
|
||||
{
|
||||
gos[0].SetActive(_val == m_Data.n_RewardID);
|
||||
}
|
||||
|
||||
public void OnClick_Check()
|
||||
{
|
||||
NewGameUI.Ins.m_GachaUI.m_gachaBase.m_GachaRepeatReward.Select_Item(m_Data.n_RewardID);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue