diff --git a/Blacksmith/Assets/Pack/Prefab/Canvas.prefab b/Blacksmith/Assets/Pack/Prefab/Canvas.prefab index e4686138..04679bf4 100644 --- a/Blacksmith/Assets/Pack/Prefab/Canvas.prefab +++ b/Blacksmith/Assets/Pack/Prefab/Canvas.prefab @@ -1264,9 +1264,9 @@ RectTransform: m_Father: {fileID: 3537025715126122596} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &6476185204789395371 CanvasRenderer: @@ -1349,8 +1349,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5980191810865840201} m_HandleRect: {fileID: 1133817211673145723} m_Direction: 0 - m_Value: 1 - m_Size: 1 + m_Value: 0 + m_Size: 0.9999999 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1862,16 +1862,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 301186263403180827} - m_LocalRotation: {x: 0, y: 0, z: -0.004404971, w: 0.9999903} + m_LocalRotation: {x: 0, y: 0, z: 0.00000003891512, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5919462, y: 0.9998538, z: 1} + m_LocalScale: {x: 0.5937901, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4576839497981118481} 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: 360, y: 0.0000032991168} + m_AnchoredPosition: {x: 360.00006, y: -0.0000046014075} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5048827403984088436 @@ -2759,9 +2759,9 @@ RectTransform: m_Father: {fileID: 3537025715126122596} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &8978416303881663765 CanvasRenderer: @@ -5817,7 +5817,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.000021176877} - m_SizeDelta: {x: 0, y: 5.83} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &733570648388344266 MonoBehaviour: @@ -6031,9 +6031,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 797784679017182329} - m_LocalRotation: {x: 0, y: 0, z: 0.005219554, w: 0.9999864} + m_LocalRotation: {x: 0, y: 0, z: -0.000000008659961, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.0264008, y: 1, z: 1} + m_LocalScale: {x: 2.019481, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2446255129621035987} @@ -6041,7 +6041,7 @@ RectTransform: 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: 359.99997, y: -0.000011459725} + m_AnchoredPosition: {x: 360, y: -0.0000032498758} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4484023687826336459 @@ -6765,7 +6765,7 @@ RectTransform: 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: 2538.5823, y: 34.20082} + m_AnchoredPosition: {x: 2534.0264, y: -0.000037788843} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2118552436235215229 @@ -6818,6 +6818,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8498260720118286968} + - {fileID: 593011807502002948} + - {fileID: 2204073413407994221} + - {fileID: 744618748874758248} + - {fileID: 8734344510901877497} - {fileID: 3291770172335059875} - {fileID: 2574726802163157375} - {fileID: 4195740792710665945} @@ -7188,6 +7192,114 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1077588530972256218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5830552452191239344} + - component: {fileID: 6995229582527671281} + - component: {fileID: 3923140167549628656} + m_Layer: 0 + m_Name: SkeletonGraphic (hand) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5830552452191239344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077588530972256218} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2777463108933907539} + 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: 0} + m_SizeDelta: {x: 182.11603, y: 187.09561} + m_Pivot: {x: 0.06701161, y: 0.41366592} +--- !u!222 &6995229582527671281 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077588530972256218} + m_CullTransparentMesh: 0 +--- !u!114 &3923140167549628656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077588530972256218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 4cd57be740b383b429161ac56cf6379c, type: 2} + additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} + multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} + screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: play_3 + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 182.11603, y: 187.09561} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 182.11603, y: 187.09561} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!1 &1077842110286770630 GameObject: m_ObjectHideFlags: 0 @@ -8324,6 +8436,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1260011320123686700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5403370098075680198} + - component: {fileID: 2839223132861624762} + - component: {fileID: 3393874236111311882} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5403370098075680198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260011320123686700} + 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: 3626833818932623730} + 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: 0} + m_SizeDelta: {x: 691.216, y: 213.0629} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2839223132861624762 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260011320123686700} + m_CullTransparentMesh: 1 +--- !u!114 &3393874236111311882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260011320123686700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 144 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 144 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text --- !u!1 &1260409972528808630 GameObject: m_ObjectHideFlags: 0 @@ -8784,9 +8975,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1376757252575210069} - m_LocalRotation: {x: 0, y: 0, z: -0.99997854, w: 0.0065502217} + m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1532811897321479711} @@ -8794,7 +8985,7 @@ RectTransform: 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: 2538.5823, y: 34.20082} + m_AnchoredPosition: {x: 2534.0264, y: -0.000037788843} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1209968000391502258 @@ -8897,6 +9088,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5F53\u524D\u914D\u65B9" +--- !u!1 &1427701105070473802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744618748874758248} + - component: {fileID: 85673986711849143} + - component: {fileID: 6472128332618225895} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744618748874758248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427701105070473802} + 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: 9044550788811412680} + 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: 261.1643, y: 107.70996} + m_SizeDelta: {x: 331, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &85673986711849143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427701105070473802} + m_CullTransparentMesh: 1 +--- !u!114 &6472128332618225895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427701105070473802} + 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: 818e5c4dbd2c9524b987fb091f588ab7, 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!1 &1440180948136094329 GameObject: m_ObjectHideFlags: 0 @@ -9978,9 +10244,9 @@ RectTransform: - {fileID: 375080259372378228} m_Father: {fileID: 8290323011136503912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 540, y: 509} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -175, y: 518} m_SizeDelta: {x: 325, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5378419527608262308 @@ -10098,7 +10364,7 @@ RectTransform: m_Father: {fileID: 8672385338243936967} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -10727,6 +10993,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8740925394338500471} - {fileID: 8485598535402401685} - {fileID: 7309180801257528304} - {fileID: 823143376321634969} @@ -10767,7 +11034,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7d1115c0d929e8143a3c914d2e06686b, type: 3} + m_Sprite: {fileID: 21300000, guid: 5d72277cd0f29d843b0aa72c209011c5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11446,7 +11713,7 @@ RectTransform: m_Father: {fileID: 2998919524913664853} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -11749,9 +12016,9 @@ RectTransform: m_Father: {fileID: 5839805334643881106} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -17} m_Pivot: {x: 0, y: 1} --- !u!222 &3788068226693922399 CanvasRenderer: @@ -12083,7 +12350,7 @@ RectTransform: m_Father: {fileID: 6395366686688947566} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -14275,9 +14542,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2154192563948978011} - m_LocalRotation: {x: 0, y: 0, z: 0.0052195475, w: 0.9999864} + m_LocalRotation: {x: 0, y: 0, z: -0.000000014108153, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.0264008, y: 1, z: 1} + m_LocalScale: {x: 2.019481, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8630107263903414318} @@ -14285,7 +14552,7 @@ RectTransform: 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: 359.99997, y: -0.000011459725} + m_AnchoredPosition: {x: 360, y: -0.0000032498758} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5721532229862511663 @@ -15099,9 +15366,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2239616646119430157} - m_LocalRotation: {x: 0, y: 0, z: -0.99997854, w: 0.0065502217} + m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 650189468646652440} @@ -15109,7 +15376,7 @@ RectTransform: 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: 2538.5823, y: 34.200798} + m_AnchoredPosition: {x: 2534.0264, y: -0.0000616307} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6619343808945260825 @@ -16358,6 +16625,41 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &2433446125072629565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3839815020926298032} + m_Layer: 5 + m_Name: 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3839815020926298032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2433446125072629565} + 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: 250683907003404180} + 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: 204} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2450107506671910005 GameObject: m_ObjectHideFlags: 0 @@ -16708,6 +17010,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2918795219920107842} - {fileID: 3339919109361498372} - {fileID: 7798967289364784859} - {fileID: 5828942971782581090} @@ -17505,7 +17808,7 @@ RectTransform: 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: 66.127205, y: -362.90808} + m_AnchoredPosition: {x: 31.926352, y: -358.35217} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1113565121583290206 @@ -18162,6 +18465,41 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2640409139701231407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6304583533463117365} + m_Layer: 5 + m_Name: 4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6304583533463117365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2640409139701231407} + 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: 250683907003404180} + 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: 303, y: -15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2642633801388101479 GameObject: m_ObjectHideFlags: 0 @@ -18619,7 +18957,7 @@ MonoBehaviour: m_HandleRect: {fileID: 4122635085113086459} m_Direction: 2 m_Value: 0.99999976 - m_Size: 0.56746364 + m_Size: 0.56737334 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -19017,10 +19355,10 @@ RectTransform: - {fileID: 2711830101893358544} m_Father: {fileID: 6645951035686500599} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -220.61, y: 201} - m_SizeDelta: {x: -76.17001, y: -382.2597} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -220.60999, y: 201} + m_SizeDelta: {x: 359.83, y: 235.7403} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5819001670985294006 CanvasRenderer: @@ -19202,6 +19540,41 @@ MonoBehaviour: _proUGUI: {fileID: 6019795492786663742} _num: {fileID: 5871673186952258392} _slider: {fileID: 3225155108210429171} +--- !u!1 &2930609517218183392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3058893911541001307} + m_Layer: 5 + m_Name: 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3058893911541001307 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2930609517218183392} + 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: 250683907003404180} + 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: -236.01726} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2954427724525326615 GameObject: m_ObjectHideFlags: 0 @@ -19661,9 +20034,9 @@ RectTransform: m_Father: {fileID: 7699624344733386004} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 19, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &6910276134660875562 CanvasRenderer: @@ -22390,7 +22763,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000095081225, y: 0} + m_AnchoredPosition: {x: 0.000095081225, y: 0.000004053116} m_SizeDelta: {x: -154, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3328899192051658011 @@ -22739,7 +23112,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 4608387714621096842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.43253627} + m_AnchorMin: {x: 0, y: 0.43262658} m_AnchorMax: {x: 1, y: 0.9999999} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -22817,9 +23190,9 @@ RectTransform: m_Father: {fileID: 5313351011590086727} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &1452091902162028114 CanvasRenderer: @@ -23288,9 +23661,9 @@ RectTransform: m_Father: {fileID: 3537025715126122596} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7090838263598634607 CanvasRenderer: @@ -24317,6 +24690,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3685632154366273758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 593011807502002948} + - component: {fileID: 5263175211353147551} + - component: {fileID: 4707621026592885636} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &593011807502002948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3685632154366273758} + 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: 9044550788811412680} + 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: -323.4895, y: 106.70996} + m_SizeDelta: {x: 331, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5263175211353147551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3685632154366273758} + m_CullTransparentMesh: 1 +--- !u!114 &4707621026592885636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3685632154366273758} + 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: 818e5c4dbd2c9524b987fb091f588ab7, 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!1 &3703891933171443034 GameObject: m_ObjectHideFlags: 0 @@ -26881,9 +27329,9 @@ RectTransform: m_Father: {fileID: 7699624344733386004} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -17} m_Pivot: {x: 0, y: 1} --- !u!222 &4195672398233337125 CanvasRenderer: @@ -28496,6 +28944,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4218592993068220101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1358566630080668756} + - component: {fileID: 891104299755749307} + - component: {fileID: 7680344546599912302} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1358566630080668756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4218592993068220101} + 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: 8123394123719219204} + m_Father: {fileID: 250683907003404180} + 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: -236.01726} + m_SizeDelta: {x: 457.6294, y: 122.0345} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &891104299755749307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4218592993068220101} + m_CullTransparentMesh: 1 +--- !u!114 &7680344546599912302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4218592993068220101} + 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: b7a1eff929ea1b54fb2469f241ff0616, 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!1 &4221607207402425494 GameObject: m_ObjectHideFlags: 0 @@ -29930,10 +30454,10 @@ RectTransform: - {fileID: 6402981133169486863} m_Father: {fileID: 8290323011136503912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 8.042236, y: -268.99634} - m_SizeDelta: {x: -105.3237, y: -1127.9141} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 8.042236, y: -259.99634} + m_SizeDelta: {x: 1324.6763, y: 1414.0859} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1970785925749393235 CanvasRenderer: @@ -30813,7 +31337,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4060501988134685625 RectTransform: m_ObjectHideFlags: 0 @@ -31670,7 +32194,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7381403087806520486 RectTransform: m_ObjectHideFlags: 0 @@ -31982,6 +32506,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4564178700854457075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8740925394338500471} + - component: {fileID: 3976595873234487836} + - component: {fileID: 4512871866526877401} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8740925394338500471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4564178700854457075} + 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: 8290323011136503912} + 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: 555} + m_SizeDelta: {x: 1440, y: 208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3976595873234487836 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4564178700854457075} + m_CullTransparentMesh: 1 +--- !u!114 &4512871866526877401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4564178700854457075} + 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: 252fc8f4c28a7b943ad0ce5a4c231675, 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!1 &4571632282756703291 GameObject: m_ObjectHideFlags: 0 @@ -33133,7 +33732,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1720741511266462717} m_HandleRect: {fileID: 6238416981292389749} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -35520,9 +36119,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5028841652703044831} - m_LocalRotation: {x: 0, y: 0, z: -0.021891246, w: 0.9997604} + m_LocalRotation: {x: 0, y: 0, z: 0.00000005063816, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6207205, y: 0.99994814, z: 1} + m_LocalScale: {x: 0.62138253, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6413101721776649384} @@ -35530,7 +36129,7 @@ RectTransform: 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: 360, y: 0.0000052891664} + m_AnchoredPosition: {x: 360, y: -1.4701469e-12} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2467262977455036767 @@ -36909,6 +37508,81 @@ MonoBehaviour: zPosition: 1 overrideAlpha: 1 hierarchy: {fileID: 8161048951584275273} +--- !u!1 &5226237045587406437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8734344510901877497} + - component: {fileID: 3193627948412633627} + - component: {fileID: 2134705094881818625} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8734344510901877497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5226237045587406437} + 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: 9044550788811412680} + 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: 547.5363, y: 107.70996} + m_SizeDelta: {x: 331, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3193627948412633627 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5226237045587406437} + m_CullTransparentMesh: 1 +--- !u!114 &2134705094881818625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5226237045587406437} + 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: 818e5c4dbd2c9524b987fb091f588ab7, 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!1 &5226696402943211120 GameObject: m_ObjectHideFlags: 0 @@ -37096,7 +37770,7 @@ RectTransform: m_Father: {fileID: 118201658110234779} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -37252,9 +37926,9 @@ RectTransform: m_Father: {fileID: 5839805334643881106} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -164, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &7386042239014752586 CanvasRenderer: @@ -37955,6 +38629,41 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &5346548208989563268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7541892437390031097} + m_Layer: 5 + m_Name: 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7541892437390031097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5346548208989563268} + 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: 250683907003404180} + 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: -305, y: 1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5347561426112033935 GameObject: m_ObjectHideFlags: 0 @@ -38286,6 +38995,145 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5365810936472197581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 250683907003404180} + - component: {fileID: 1790305857690683862} + - component: {fileID: 8756132665017064463} + - component: {fileID: 830907905823848457} + - component: {fileID: 6939589334205440420} + m_Layer: 5 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &250683907003404180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5365810936472197581} + 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: 6304583533463117365} + - {fileID: 3839815020926298032} + - {fileID: 7541892437390031097} + - {fileID: 3058893911541001307} + - {fileID: 1358566630080668756} + m_Father: {fileID: 2777463108933907539} + 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: 0} + m_SizeDelta: {x: 388.3462, y: 352.0266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1790305857690683862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5365810936472197581} + m_CullTransparentMesh: 1 +--- !u!114 &8756132665017064463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5365810936472197581} + 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: 0} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &830907905823848457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5365810936472197581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8756132665017064463} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6939589334205440420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5365810936472197581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] --- !u!1 &5370294289019929920 GameObject: m_ObjectHideFlags: 0 @@ -40950,7 +41798,7 @@ RectTransform: 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: 2538.5823, y: 34.200798} + m_AnchoredPosition: {x: 2534.0264, y: -0.0000616307} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8118129646771151561 @@ -40974,6 +41822,52 @@ MonoBehaviour: zPosition: 1 overrideAlpha: 1 hierarchy: {fileID: 8161048951584275273} +--- !u!1 &5824993797657679285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2777463108933907539} + - component: {fileID: 338924203157644314} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2777463108933907539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5824993797657679285} + 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: 5830552452191239344} + - {fileID: 250683907003404180} + m_Father: {fileID: 3626833818932623730} + 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: -351} + m_SizeDelta: {x: 3312.2021, y: 5198} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &338924203157644314 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5824993797657679285} + m_CullTransparentMesh: 1 --- !u!1 &5840546946575505153 GameObject: m_ObjectHideFlags: 0 @@ -42635,16 +43529,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6079655635511677779} - m_LocalRotation: {x: 0, y: 0, z: -0.0045237606, w: 0.9999898} + m_LocalRotation: {x: 0, y: 0, z: 0.000000040369912, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5919928, y: 0.9998664, z: 1} + m_LocalScale: {x: 0.5937905, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1923300188990817061} 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: 359.99994, y: -0.0000057819443} + m_AnchoredPosition: {x: 360, y: -0.000003553884} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6972596386843254456 @@ -42979,7 +43873,7 @@ RectTransform: m_Father: {fileID: 3874936115030451230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -44560,6 +45454,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &6340491358146238979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2204073413407994221} + - component: {fileID: 4129569615819953415} + - component: {fileID: 541020876923934107} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2204073413407994221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340491358146238979} + 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: 9044550788811412680} + 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: -27.221802, y: 107.70996} + m_SizeDelta: {x: 331, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4129569615819953415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340491358146238979} + m_CullTransparentMesh: 1 +--- !u!114 &541020876923934107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340491358146238979} + 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: 818e5c4dbd2c9524b987fb091f588ab7, 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!1 &6357821562586074589 GameObject: m_ObjectHideFlags: 0 @@ -46577,7 +47546,7 @@ RectTransform: m_Father: {fileID: 3313435590701400801} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -47007,9 +47976,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6740980350211284577} - m_LocalRotation: {x: 0, y: 0, z: -0.003045047, w: 0.99999535} + m_LocalRotation: {x: 0, y: 0, z: 0.000000007728171, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99996984, y: 1.0000032, z: 1} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4576839497981118481} @@ -47017,7 +47986,7 @@ RectTransform: 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: 360, y: 0.000010383075} + m_AnchoredPosition: {x: 359.99997, y: 0.000005564288} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7210788943419104483 @@ -47517,9 +48486,9 @@ RectTransform: m_Father: {fileID: 5313351011590086727} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1763652740712127132 CanvasRenderer: @@ -47669,7 +48638,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2373316333302969873 RectTransform: m_ObjectHideFlags: 0 @@ -47744,6 +48713,90 @@ MonoBehaviour: drawingButton: {fileID: 6235654226744741268} shopButton: {fileID: 4706762678928295075} battleButton: {fileID: 343682661591930742} + _gameObjects: + - {fileID: 3685632154366273758} + - {fileID: 6340491358146238979} + - {fileID: 1427701105070473802} + - {fileID: 5226237045587406437} +--- !u!1 &6822468083842351213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8123394123719219204} + - component: {fileID: 6228991833792540634} + - component: {fileID: 7678694776246470361} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8123394123719219204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6822468083842351213} + 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: 1358566630080668756} + 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.00022125244} + m_SizeDelta: {x: -69.2832, y: 0.00053406} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6228991833792540634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6822468083842351213} + m_CullTransparentMesh: 1 +--- !u!114 &7678694776246470361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6822468083842351213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 70b604661a72188469f09f1578f2dd7a, type: 3} + m_FontSize: 107 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 107 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button --- !u!1 &6823204952642080375 GameObject: m_ObjectHideFlags: 0 @@ -49671,7 +50724,7 @@ RectTransform: 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: -251, y: 933} + m_AnchoredPosition: {x: -251, y: 942} m_SizeDelta: {x: 567.5961, y: 602.2239} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9002857307211226448 @@ -51525,9 +52578,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7330691810041498889} - m_LocalRotation: {x: 0, y: 0, z: -0.0030447382, w: 0.99999535} + m_LocalRotation: {x: 0, y: 0, z: 0.000000009365342, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99997336, y: 0.9999993, z: 1} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1923300188990817061} @@ -51535,7 +52588,7 @@ RectTransform: 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: 360, y: -0.0000039431584} + m_AnchoredPosition: {x: 359.99997, y: -0.000010355754} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3832969572414765550 @@ -53014,10 +54067,10 @@ RectTransform: - {fileID: 4598246805543222458} m_Father: {fileID: 8290323011136503912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: -269} - m_SizeDelta: {x: 0.0001, y: -1127.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: -260} + m_SizeDelta: {x: 1430.0001, y: 1414.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8436549629369809820 CanvasRenderer: @@ -56117,9 +57170,9 @@ RectTransform: m_Father: {fileID: 5313351011590086727} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &8503880217172369088 CanvasRenderer: @@ -56202,8 +57255,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 242037458868418438} m_HandleRect: {fileID: 3851862916910029390} m_Direction: 0 - m_Value: 1 - m_Size: 1 + m_Value: 0 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -57617,7 +58670,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9162242330816195440 RectTransform: m_ObjectHideFlags: 0 @@ -57905,7 +58958,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000095081225, y: 0} + m_AnchoredPosition: {x: 0.000095081225, y: 0.000004053116} m_SizeDelta: {x: -154, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1211076131462166676 @@ -58390,9 +59443,9 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8349369190136878871} - m_LocalRotation: {x: 0, y: 0, z: -0.021820178, w: 0.99976194} + m_LocalRotation: {x: 0, y: 0, z: 0.000000057662152, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6207039, y: 0.9999629, z: 1} + m_LocalScale: {x: 0.6213826, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4743637259142969288} @@ -58400,7 +59453,7 @@ RectTransform: 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: 359.99997, y: 0.00000088081936} + m_AnchoredPosition: {x: 359.99997, y: 0.0000067430556} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8448577749111065260 @@ -59401,6 +60454,41 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8487789173036268108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2918795219920107842} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2918795219920107842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8487789173036268108} + 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: 3537025715126122596} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 114.160034, y: -99.83081} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8496314822862652244 GameObject: m_ObjectHideFlags: 0 @@ -60579,6 +61667,124 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &8628854463882355360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3626833818932623730} + - component: {fileID: 8441939270954115692} + - component: {fileID: 4484838551271368698} + - component: {fileID: 5105281483015202059} + m_Layer: 5 + m_Name: GuidePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3626833818932623730 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8628854463882355360} + 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: 2777463108933907539} + - {fileID: 8484497023427547071} + - {fileID: 5403370098075680198} + m_Father: {fileID: 9144618406897127126} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8441939270954115692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8628854463882355360} + m_CullTransparentMesh: 1 +--- !u!114 &4484838551271368698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8628854463882355360} + 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: 0} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &5105281483015202059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8628854463882355360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41263223f8a140e48aa2e010911737a1, type: 3} + m_Name: + m_EditorClassIdentifier: + textList: + - {fileID: 3058893911541001307} + - {fileID: 7541892437390031097} + - {fileID: 3839815020926298032} + - {fileID: 6304583533463117365} + seleTra: {fileID: 2777463108933907539} + eventButton: {fileID: 830907905823848457} + _forgePanel: {fileID: 8854900724912719402} + _battlePanel: {fileID: 4266824577745746157} + _rogenItem: {fileID: 2246665443184843412} + _sceleImage: {fileID: 6013373193968355625} + _text: {fileID: 7678694776246470361} + _text2: {fileID: 3393874236111311882} + crafting: {fileID: 4514614351556456562} + cra2: {fileID: 3514421123677829675} + hand: {fileID: 5830552452191239344} + lock1: {fileID: 2777463108933907539} + lock2: {fileID: 3472266402357531423} + lock2c1: {fileID: 3471735572382683490} + lock3: {fileID: 5597106930824322075} + lock4: {fileID: 5196342929835206987} + lock5: {fileID: 1124177201826635554} + lock5c1: {fileID: 6645951035686500599} + lock5c2: {fileID: 8952389231503826136} + lock6: {fileID: 6928810559084296547} + lock7: {fileID: 2918795219920107842} + lock8: {fileID: 1542426104437375412} --- !u!1 &8632140989040679705 GameObject: m_ObjectHideFlags: 0 @@ -61735,9 +62941,9 @@ RectTransform: - {fileID: 6656904943425161606} m_Father: {fileID: 8290323011136503912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 182, y: 509} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -533, y: 518} m_SizeDelta: {x: 325, y: 187} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5119280485378653486 @@ -62150,6 +63356,7 @@ RectTransform: - {fileID: 2373316333302969873} - {fileID: 3303366270476842511} - {fileID: 5306026408061988197} + - {fileID: 3626833818932623730} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -62196,7 +63403,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1430, y: 2560} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -62239,6 +63446,7 @@ MonoBehaviour: storePanel: {fileID: 6974687513819702662} combatPanel: {fileID: 7477918169629179410} endPanel: {fileID: 5971719914544103359} + guidePanel: {fileID: 5105281483015202059} --- !u!1 &8755528767935906231 GameObject: m_ObjectHideFlags: 0 @@ -64213,6 +65421,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: x1 +--- !u!1 &8989158078386714097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8484497023427547071} + - component: {fileID: 595394056132481657} + - component: {fileID: 6013373193968355625} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8484497023427547071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8989158078386714097} + 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: 3626833818932623730} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &595394056132481657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8989158078386714097} + m_CullTransparentMesh: 1 +--- !u!114 &6013373193968355625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8989158078386714097} + 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: 0} + 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!1 &8991713345479775360 GameObject: m_ObjectHideFlags: 0 @@ -64398,7 +65681,7 @@ RectTransform: m_Father: {fileID: 6089023718003132159} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -65692,7 +66975,7 @@ RectTransform: m_Father: {fileID: 6624756168193816456} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel.meta b/Blacksmith/Assets/Pack/UI/GuidePanel.meta new file mode 100644 index 00000000..c68798c4 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/GuidePanel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a06789d2258ab0c4abeba389fc7087ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png b/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png new file mode 100644 index 00000000..1aaaf739 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png differ diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png.meta b/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png.meta new file mode 100644 index 00000000..c790a0b3 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/GuidePanel/3d373fb95655343fafe6b6821c2ba96.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: ce872fa9eb6ce654a806ef117a11c73d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png b/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png new file mode 100644 index 00000000..c79a3f80 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png differ diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png.meta b/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png.meta new file mode 100644 index 00000000..6702ab4e --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/GuidePanel/b989ceb57ffef662e0a377499fa4e8b.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: f89221d90a8f1814e87f6818c5ea99bb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png b/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png new file mode 100644 index 00000000..16b2b9b3 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png differ diff --git a/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png.meta b/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png.meta new file mode 100644 index 00000000..76467567 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/GuidePanel/cb7da73c88c65dbddc7122be3012ddc.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 3f01830ec24a87f419cf51606a447c89 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg b/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg new file mode 100644 index 00000000..ab3efd26 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg differ diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg.meta b/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg.meta new file mode 100644 index 00000000..4f7bbff0 --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/StorePanel/5f0e838c48c6e074c4d903a952be7ae.jpg.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 5d72277cd0f29d843b0aa72c209011c5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png b/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png new file mode 100644 index 00000000..b38526c5 Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png differ diff --git a/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png.meta b/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png.meta new file mode 100644 index 00000000..e6b49f9e --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/StorePanel/6fbfb4ef62999687ed8fa2d5eba78bf.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 252fc8f4c28a7b943ad0ce5a4c231675 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png b/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png new file mode 100644 index 00000000..67bca8ed Binary files /dev/null and b/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png differ diff --git a/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png.meta b/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png.meta new file mode 100644 index 00000000..29c5532d --- /dev/null +++ b/Blacksmith/Assets/Pack/UI/Swithch/1231712f206e56ba6814ddfe7756796.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 818e5c4dbd2c9524b987fb091f588ab7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide.meta b/Blacksmith/Assets/Pack/spine/Guide.meta new file mode 100644 index 00000000..785a0327 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c008bf60ef9e22040a2ac54b821b8ad4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt b/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt new file mode 100644 index 00000000..fff6c39d --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt @@ -0,0 +1,7 @@ +hand.png + size: 188, 192 + filter: Linear, Linear + pma: true +images/hand + bounds: 2, 2, 184, 188 + offsets: 0, 0, 185, 188 diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt.meta b/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt.meta new file mode 100644 index 00000000..1d95db23 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 54f2d155d9caa224194d4ad0b3ceaed0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.png b/Blacksmith/Assets/Pack/spine/Guide/hand.png new file mode 100644 index 00000000..d888b591 Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Guide/hand.png differ diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.png.meta b/Blacksmith/Assets/Pack/spine/Guide/hand.png.meta new file mode 100644 index 00000000..8c922477 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 85bd6ecb5b9b0a24aaee814aa0b61bf0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes b/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes new file mode 100644 index 00000000..2fe265f6 Binary files /dev/null and b/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes differ diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes.meta b/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes.meta new file mode 100644 index 00000000..1e6bff17 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 400efd8d2026e9d4c86d0795f3b6e356 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset b/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset new file mode 100644 index 00000000..f0d5a4cc --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: hand_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 54f2d155d9caa224194d4ad0b3ceaed0, type: 3} + materials: + - {fileID: 2100000, guid: e2ff7ac07ca526a4e9384f68c81d9b34, type: 2} diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset.meta b/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset.meta new file mode 100644 index 00000000..1f48f18a --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f54e1eab2cfa4649a291b83b4b1a557 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat b/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat new file mode 100644 index 00000000..5f42f952 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: hand_Material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 85bd6ecb5b9b0a24aaee814aa0b61bf0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat.meta b/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat.meta new file mode 100644 index 00000000..49fbd300 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2ff7ac07ca526a4e9384f68c81d9b34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset b/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset new file mode 100644 index 00000000..8c30d675 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: hand_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 6f54e1eab2cfa4649a291b83b4b1a557, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 400efd8d2026e9d4c86d0795f3b6e356, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset.meta b/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset.meta new file mode 100644 index 00000000..26166268 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/Guide/hand_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cd57be740b383b429161ac56cf6379c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json index 142bb030..eb8ea638 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json @@ -4,7 +4,7 @@ "Bufftype": 1, "Buffprobability": 10000, "Buffeffect1": 1, - "Buffparameter1": 3000, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302011, @@ -18,7 +18,7 @@ "Bufftype": 2, "Buffprobability": 10000, "Buffeffect1": 2, - "Buffparameter1": 3000, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302011, @@ -29,6 +29,34 @@ }, { "ID": 10003, + "Bufftype": 1, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302011, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10004, + "Bufftype": 2, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302011, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10005, "Bufftype": 3, "Buffprobability": 10000, "Buffeffect1": 4, @@ -42,10 +70,24 @@ "Buffdisappeartime": 0 }, { - "ID": 10004, - "Bufftype": 20, + "ID": 10006, + "Bufftype": 3, "Buffprobability": 10000, - "Buffeffect1": 3, + "Buffeffect1": 4, + "Buffparameter1": 1500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302011, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10007, + "Bufftype": 1, + "Buffprobability": 10000, + "Buffeffect1": 1, "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, @@ -55,9 +97,37 @@ "Buffdisappear": 0, "Buffdisappeartime": 0 }, + { + "ID": 10008, + "Bufftype": 2, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302011, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10009, + "Bufftype": 3, + "Buffprobability": 10000, + "Buffeffect1": 4, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302011, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, { "ID": 10101, - "Bufftype": 4, + "Bufftype": 11, "Buffprobability": 10000, "Buffeffect1": 1, "Buffparameter1": 3000, @@ -71,7 +141,7 @@ }, { "ID": 10102, - "Bufftype": 5, + "Bufftype": 12, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 3000, @@ -85,7 +155,7 @@ }, { "ID": 10103, - "Bufftype": 6, + "Bufftype": 11, "Buffprobability": 10000, "Buffeffect1": 1, "Buffparameter1": 3000, @@ -98,11 +168,109 @@ "Buffdisappeartime": 0 }, { - "ID": 10201, - "Bufftype": 7, + "ID": 10104, + "Bufftype": 12, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 3000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10105, + "Bufftype": 11, "Buffprobability": 10000, "Buffeffect1": 1, - "Buffparameter1": 3000, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10106, + "Bufftype": 11, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10107, + "Bufftype": 13, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10108, + "Bufftype": 11, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10109, + "Bufftype": 13, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10110, + "Bufftype": 11, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302201, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10201, + "Bufftype": 21, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302301, @@ -113,10 +281,94 @@ }, { "ID": 10202, - "Bufftype": 8, + "Bufftype": 22, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10203, + "Bufftype": 21, "Buffprobability": 10000, "Buffeffect1": 1, - "Buffparameter1": 3000, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10204, + "Bufftype": 22, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10206, + "Bufftype": 23, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10207, + "Bufftype": 21, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10208, + "Bufftype": 22, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302301, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10209, + "Bufftype": 23, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 2000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302301, @@ -127,10 +379,10 @@ }, { "ID": 10301, - "Bufftype": 9, + "Bufftype": 31, "Buffprobability": 10000, "Buffeffect1": 1, - "Buffparameter1": 3000, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302401, @@ -141,10 +393,94 @@ }, { "ID": 10302, - "Bufftype": 10, + "Bufftype": 32, "Buffprobability": 10000, "Buffeffect1": 1, - "Buffparameter1": 3000, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10303, + "Bufftype": 31, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10304, + "Bufftype": 32, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10305, + "Bufftype": 33, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10306, + "Bufftype": 31, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10307, + "Bufftype": 32, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10308, + "Bufftype": 33, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 2000, "Buffeffect2": 0, "Buffparameter2": 0, "Bufftarget": 302401, @@ -155,13 +491,13 @@ }, { "ID": 10401, - "Bufftype": 11, + "Bufftype": 41, "Buffprobability": 10000, - "Buffeffect1": 2, - "Buffparameter1": 3000, + "Buffeffect1": 1, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, - "Bufftarget": 302501, + "Bufftarget": 302401, "BuffSpecial": 0, "Bufftake": 100, "Buffdisappear": 0, @@ -169,41 +505,83 @@ }, { "ID": 10402, - "Bufftype": 12, + "Bufftype": 42, "Buffprobability": 10000, "Buffeffect1": 2, - "Buffparameter1": 3000, + "Buffparameter1": 2000, "Buffeffect2": 0, "Buffparameter2": 0, - "Bufftarget": 302501, + "Bufftarget": 302401, "BuffSpecial": 0, "Bufftake": 100, "Buffdisappear": 0, "Buffdisappeartime": 0 }, { - "ID": 10410, - "Bufftype": 13, + "ID": 10403, + "Bufftype": 41, "Buffprobability": 10000, - "Buffeffect1": 9, - "Buffparameter1": 1, + "Buffeffect1": 1, + "Buffparameter1": 1000, "Buffeffect2": 0, "Buffparameter2": 0, - "Bufftarget": 302501, + "Bufftarget": 302401, "BuffSpecial": 0, "Bufftake": 100, "Buffdisappear": 0, "Buffdisappeartime": 0 }, { - "ID": 10411, - "Bufftype": 13, + "ID": 10404, + "Bufftype": 42, "Buffprobability": 10000, - "Buffeffect1": 9, - "Buffparameter1": 2, + "Buffeffect1": 2, + "Buffparameter1": 2000, "Buffeffect2": 0, "Buffparameter2": 0, - "Bufftarget": 302501, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10405, + "Bufftype": 41, + "Buffprobability": 10000, + "Buffeffect1": 1, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10406, + "Bufftype": 42, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10407, + "Bufftype": 43, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302401, "BuffSpecial": 0, "Bufftake": 100, "Buffdisappear": 0, @@ -211,9 +589,51 @@ }, { "ID": 10501, - "Bufftype": 13, + "Bufftype": 52, "Buffprobability": 10000, - "Buffeffect1": 1, + "Buffeffect1": 2, + "Buffparameter1": 1500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302101, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10502, + "Bufftype": 52, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 2000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302101, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10503, + "Bufftype": 58, + "Buffprobability": 10000, + "Buffeffect1": 8, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302101, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10504, + "Bufftype": 52, + "Buffprobability": 10000, + "Buffeffect1": 2, "Buffparameter1": 3000, "Buffeffect2": 0, "Buffparameter2": 0, @@ -225,9 +645,9 @@ }, { "ID": 10601, - "Bufftype": 14, + "Bufftype": 62, "Buffprobability": 10000, - "Buffeffect1": 1, + "Buffeffect1": 2, "Buffparameter1": 3000, "Buffeffect2": 0, "Buffparameter2": 0, @@ -237,9 +657,65 @@ "Buffdisappear": 0, "Buffdisappeartime": 0 }, + { + "ID": 10602, + "Bufftype": 63, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 1, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10603, + "Bufftype": 62, + "Buffprobability": 10000, + "Buffeffect1": 2, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 302601, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10604, + "Bufftype": 63, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 500, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 1, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, + { + "ID": 10605, + "Bufftype": 63, + "Buffprobability": 10000, + "Buffeffect1": 3, + "Buffparameter1": 1000, + "Buffeffect2": 0, + "Buffparameter2": 0, + "Bufftarget": 1, + "BuffSpecial": 0, + "Bufftake": 100, + "Buffdisappear": 0, + "Buffdisappeartime": 0 + }, { "ID": 10701, - "Bufftype": 15, + "Bufftype": 71, "Buffprobability": 10000, "Buffeffect1": 1, "Buffparameter1": 500, @@ -253,7 +729,7 @@ }, { "ID": 10702, - "Bufftype": 15, + "Bufftype": 72, "Buffprobability": 10000, "Buffeffect1": 1, "Buffparameter1": 1000, @@ -267,7 +743,7 @@ }, { "ID": 10703, - "Bufftype": 15, + "Bufftype": 73, "Buffprobability": 10000, "Buffeffect1": 1, "Buffparameter1": 2000, @@ -281,7 +757,7 @@ }, { "ID": 10801, - "Bufftype": 16, + "Bufftype": 81, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 500, @@ -295,7 +771,7 @@ }, { "ID": 10802, - "Bufftype": 16, + "Bufftype": 82, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 1000, @@ -309,7 +785,7 @@ }, { "ID": 10803, - "Bufftype": 16, + "Bufftype": 83, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 2000, @@ -323,7 +799,7 @@ }, { "ID": 10901, - "Bufftype": 17, + "Bufftype": 91, "Buffprobability": 10000, "Buffeffect1": 3, "Buffparameter1": 500, @@ -337,7 +813,7 @@ }, { "ID": 10902, - "Bufftype": 17, + "Bufftype": 92, "Buffprobability": 10000, "Buffeffect1": 3, "Buffparameter1": 1000, @@ -351,7 +827,7 @@ }, { "ID": 10903, - "Bufftype": 17, + "Bufftype": 93, "Buffprobability": 10000, "Buffeffect1": 3, "Buffparameter1": 2000, @@ -365,7 +841,7 @@ }, { "ID": 11001, - "Bufftype": 18, + "Bufftype": 101, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 8000, @@ -379,7 +855,7 @@ }, { "ID": 11002, - "Bufftype": 18, + "Bufftype": 102, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 16000, @@ -393,7 +869,7 @@ }, { "ID": 11003, - "Bufftype": 18, + "Bufftype": 103, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 24000, @@ -407,7 +883,7 @@ }, { "ID": 11004, - "Bufftype": 18, + "Bufftype": 104, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 36000, @@ -421,7 +897,7 @@ }, { "ID": 11101, - "Bufftype": 19, + "Bufftype": 105, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 8000, @@ -435,7 +911,7 @@ }, { "ID": 11102, - "Bufftype": 19, + "Bufftype": 106, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 16000, @@ -449,7 +925,7 @@ }, { "ID": 11103, - "Bufftype": 19, + "Bufftype": 107, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 24000, @@ -463,7 +939,7 @@ }, { "ID": 11104, - "Bufftype": 19, + "Bufftype": 108, "Buffprobability": 10000, "Buffeffect1": 2, "Buffparameter1": 36000, diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_skill.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_skill.json index fea4f3f1..bd0bac6c 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_skill.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_skill.json @@ -552,9 +552,9 @@ "Skillmusic": 0 }, { - "ID": 3020116, + "ID": 3020130, "Skilltype": 2, - "Skillname": "剑类武器增加伤害1", + "Skillname": "剑类武器攻击+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -575,32 +575,9 @@ "Skillmusic": 0 }, { - "ID": 3020121, + "ID": 3020131, "Skilltype": 2, - "Skillname": "剑类武器增加暴击1", - "Skillbody": 0, - "SkillSpecial": 0, - "Skillcover": 0, - "Skillhurt": 0, - "SkillCD": 0, - "SkillDamage": 0, - "Skillrange": [ - 0 - ], - "Skillbuild": [ - 0 - ], - "Skillgeneratetime": 0, - "Skillmove": 0, - "Skillscattering": "0", - "Skilladdbuff": 10003, - "Skilltarget": 0, - "Skillmusic": 0 - }, - { - "ID": 3020126, - "Skilltype": 2, - "Skillname": "剑类武器增加血量1", + "Skillname": "剑类武器血量+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -621,9 +598,32 @@ "Skillmusic": 0 }, { - "ID": 3020119, + "ID": 3020132, "Skilltype": 2, - "Skillname": "剑类武器增加攻击速度1", + "Skillname": "剑类武器攻击+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10003, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3020133, + "Skilltype": 2, + "Skillname": "剑类武器血量+20%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -643,6 +643,121 @@ "Skilltarget": 0, "Skillmusic": 0 }, + { + "ID": 3020134, + "Skilltype": 2, + "Skillname": "剑类武器暴击+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10005, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3020135, + "Skilltype": 2, + "Skillname": "剑类武器暴击+15%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10006, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3020140, + "Skilltype": 2, + "Skillname": "剑类武器攻击力+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10007, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3020142, + "Skilltype": 2, + "Skillname": "剑类武器血量+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10008, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3020143, + "Skilltype": 2, + "Skillname": "剑类武器暴击+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10009, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3021011, "Skilltype": 1, @@ -735,6 +850,98 @@ "Skilltarget": 1, "Skillmusic": 0 }, + { + "ID": 3021030, + "Skilltype": 2, + "Skillname": "重甲类提供生命+15%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10501, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3021040, + "Skilltype": 2, + "Skillname": "战场内提供的生命+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10502, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3021041, + "Skilltype": 2, + "Skillname": "收到的伤害-10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10503, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3021042, + "Skilltype": 2, + "Skillname": "战场内提供的生命+30%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10504, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3022011, "Skilltype": 1, @@ -828,9 +1035,9 @@ "Skillmusic": 0 }, { - "ID": 3022016, + "ID": 3022030, "Skilltype": 2, - "Skillname": "所有长柄类伤害增加30%", + "Skillname": "长柄类武器攻击+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -851,9 +1058,9 @@ "Skillmusic": 0 }, { - "ID": 3022017, + "ID": 3022031, "Skilltype": 2, - "Skillname": "所有长柄类生命上限增加30%", + "Skillname": "长柄类武器血量+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -873,6 +1080,190 @@ "Skilltarget": 0, "Skillmusic": 0 }, + { + "ID": 3022032, + "Skilltype": 2, + "Skillname": "长柄类武器攻击+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10103, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022033, + "Skilltype": 2, + "Skillname": "长柄类武器血量+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10104, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022034, + "Skilltype": 2, + "Skillname": "长柄类武器暴击+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10105, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022035, + "Skilltype": 2, + "Skillname": "长柄类武器暴击+15%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10106, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022036, + "Skilltype": 2, + "Skillname": "长柄类武器攻速+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10107, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022040, + "Skilltype": 2, + "Skillname": "长柄类攻击+5%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10108, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022041, + "Skilltype": 2, + "Skillname": "长柄类攻击+15%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10109, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3022042, + "Skilltype": 2, + "Skillname": "长柄类攻击+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10110, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3023011, "Skilltype": 1, @@ -970,9 +1361,9 @@ "Skillmusic": 0 }, { - "ID": 3023016, + "ID": 3023030, "Skilltype": 2, - "Skillname": "所有仗类伤害增加30%", + "Skillname": "杖类武器攻击+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -993,9 +1384,32 @@ "Skillmusic": 0 }, { - "ID": 3023017, + "ID": 3023031, "Skilltype": 2, - "Skillname": "所有仗类生命上限增加30%", + "Skillname": "杖类武器血量+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10201, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3023032, + "Skilltype": 2, + "Skillname": "杖类武器攻击+20%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1015,6 +1429,121 @@ "Skilltarget": 0, "Skillmusic": 0 }, + { + "ID": 3023033, + "Skilltype": 2, + "Skillname": "杖类武器血量+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10203, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3023034, + "Skilltype": 2, + "Skillname": "杖类武器攻速+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10204, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3023040, + "Skilltype": 2, + "Skillname": "杖类武器攻击力+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10206, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3023041, + "Skilltype": 2, + "Skillname": "杖类武器血量+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10207, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3023042, + "Skilltype": 2, + "Skillname": "杖类武器攻速+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10208, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3024011, "Skilltype": 1, @@ -1034,7 +1563,7 @@ "Skillgeneratetime": 100, "Skillmove": 60, "Skillscattering": "0", - "Skilladdbuff": 0, + "Skilladdbuff": 10209, "Skilltarget": 1, "Skillmusic": 0 }, @@ -1108,9 +1637,9 @@ "Skillmusic": 0 }, { - "ID": 3024016, + "ID": 3024030, "Skilltype": 2, - "Skillname": "所有弓箭类伤害增加30%", + "Skillname": "弓箭类武器攻击+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1131,9 +1660,9 @@ "Skillmusic": 0 }, { - "ID": 3024017, + "ID": 3024031, "Skilltype": 2, - "Skillname": "所有弓箭类生命上限增加30%", + "Skillname": "弓箭类武器血量+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1153,10 +1682,148 @@ "Skilltarget": 0, "Skillmusic": 0 }, + { + "ID": 3024032, + "Skilltype": 2, + "Skillname": "弓箭类武器攻击+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10303, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3024033, + "Skilltype": 2, + "Skillname": "弓箭类武器血量+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10304, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3024034, + "Skilltype": 2, + "Skillname": "弓箭类武器攻速+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10305, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3024040, + "Skilltype": 2, + "Skillname": "弓箭类武器攻击力+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10306, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3024041, + "Skilltype": 2, + "Skillname": "弓箭类武器血量+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10307, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3024042, + "Skilltype": 2, + "Skillname": "弓箭类武器攻速+20%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10308, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3025011, "Skilltype": 1, - "Skillname": "手里剑类武器1阶段普攻", + "Skillname": "飞镖类武器1阶段普攻", "Skillbody": 30250111, "SkillSpecial": 0, "Skillcover": 0, @@ -1179,7 +1846,7 @@ { "ID": 3025012, "Skilltype": 1, - "Skillname": "手里剑类武器2阶段普攻", + "Skillname": "飞镖类武器2阶段普攻", "Skillbody": 30250121, "SkillSpecial": 0, "Skillcover": 0, @@ -1202,7 +1869,7 @@ { "ID": 3025013, "Skilltype": 1, - "Skillname": "手里剑类武器3阶段普攻", + "Skillname": "飞镖类武器3阶段普攻", "Skillbody": 30250131, "SkillSpecial": 0, "Skillcover": 0, @@ -1225,7 +1892,7 @@ { "ID": 3025014, "Skilltype": 1, - "Skillname": "手里剑类武器4阶段普攻", + "Skillname": "飞镖类武器4阶段普攻", "Skillbody": 30250141, "SkillSpecial": 0, "Skillcover": 0, @@ -1246,9 +1913,9 @@ "Skillmusic": 0 }, { - "ID": 3025016, + "ID": 3025030, "Skilltype": 2, - "Skillname": "所有手里剑类伤害增加30%", + "Skillname": "飞镖类武器攻击+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1269,9 +1936,9 @@ "Skillmusic": 0 }, { - "ID": 3025017, + "ID": 3025031, "Skilltype": 2, - "Skillname": "所有手里剑类生命上限增加30%", + "Skillname": "飞镖类武器血量+10%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1292,9 +1959,9 @@ "Skillmusic": 0 }, { - "ID": 3025018, + "ID": 3025032, "Skilltype": 2, - "Skillname": "手里剑箭穿透1", + "Skillname": "飞镖类武器攻击+20%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1310,14 +1977,14 @@ "Skillgeneratetime": 0, "Skillmove": 0, "Skillscattering": "0", - "Skilladdbuff": 10410, + "Skilladdbuff": 10403, "Skilltarget": 0, "Skillmusic": 0 }, { - "ID": 3025019, + "ID": 3025033, "Skilltype": 2, - "Skillname": "手里剑箭穿透2", + "Skillname": "飞镖类武器血量+20%", "Skillbody": 0, "SkillSpecial": 0, "Skillcover": 0, @@ -1333,7 +2000,76 @@ "Skillgeneratetime": 0, "Skillmove": 0, "Skillscattering": "0", - "Skilladdbuff": 10411, + "Skilladdbuff": 10404, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3025040, + "Skilltype": 2, + "Skillname": "飞镖类武器攻击力+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10405, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3025041, + "Skilltype": 2, + "Skillname": "飞镖类武器血量+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10406, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3025042, + "Skilltype": 2, + "Skillname": "飞镖类武器攻速+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10407, "Skilltarget": 0, "Skillmusic": 0 }, @@ -1429,6 +2165,121 @@ "Skilltarget": 1, "Skillmusic": 0 }, + { + "ID": 3026030, + "Skilltype": 2, + "Skillname": "轻甲类生命+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10601, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3026031, + "Skilltype": 2, + "Skillname": "所有武器攻速+5%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10602, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3026040, + "Skilltype": 2, + "Skillname": "轻甲类生命+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10603, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3026041, + "Skilltype": 2, + "Skillname": "所有武器攻速+5%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10604, + "Skilltarget": 0, + "Skillmusic": 0 + }, + { + "ID": 3026042, + "Skilltype": 2, + "Skillname": "所有武器攻速+10%", + "Skillbody": 0, + "SkillSpecial": 0, + "Skillcover": 0, + "Skillhurt": 0, + "SkillCD": 0, + "SkillDamage": 0, + "Skillrange": [ + 0 + ], + "Skillbuild": [ + 0 + ], + "Skillgeneratetime": 0, + "Skillmove": 0, + "Skillscattering": "0", + "Skilladdbuff": 10605, + "Skilltarget": 0, + "Skillmusic": 0 + }, { "ID": 3010011, "Skilltype": 2, diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_skillrogue.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_skillrogue.json index 4c6cf9b6..5c2e8014 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_skillrogue.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_skillrogue.json @@ -302,13 +302,13 @@ 2014 ], "Frontend": 0, - "Quality": 3, + "Quality": 2, "Icon": "duanjian", - "Addskill": 3020116, + "Addskill": 3020130, "Replace": 0, "Weight": 60, "Title": "剑伤害增加", - "Describe": "剑增加伤害1" + "Describe": "剑类武器攻击+10%" }, { "ID": 90702, @@ -319,13 +319,13 @@ 2014 ], "Frontend": 0, - "Quality": 3, + "Quality": 2, "Icon": "duanjian", - "Addskill": 3020121, + "Addskill": 3020131, "Replace": 0, "Weight": 60, - "Title": "剑暴击增加", - "Describe": "剑增加暴击1" + "Title": "剑血量增加", + "Describe": "剑类武器血量+10%" }, { "ID": 90703, @@ -336,13 +336,13 @@ 2014 ], "Frontend": 0, - "Quality": 2, + "Quality": 3, "Icon": "duanjian", - "Addskill": 3020126, + "Addskill": 3020132, "Replace": 0, - "Weight": 60, - "Title": "剑血量增加", - "Describe": "剑增加血量1" + "Weight": 30, + "Title": "剑攻击增加", + "Describe": "剑类武器攻击+20%" }, { "ID": 90704, @@ -353,13 +353,47 @@ 2014 ], "Frontend": 0, + "Quality": 3, + "Icon": "duanjian", + "Addskill": 3020133, + "Replace": 0, + "Weight": 30, + "Title": "剑血量增加", + "Describe": "剑类武器血量+20%" + }, + { + "ID": 90705, + "Carryingprops": [ + 2011, + 2012, + 2013, + 2014 + ], + "Frontend": 0, "Quality": 2, "Icon": "duanjian", - "Addskill": 3020119, + "Addskill": 3020134, "Replace": 0, - "Weight": 60, - "Title": "剑攻速增加", - "Describe": "剑增加攻击速度1" + "Weight": 30, + "Title": "剑暴击增加", + "Describe": "剑类武器暴击+10%" + }, + { + "ID": 90706, + "Carryingprops": [ + 2011, + 2012, + 2013, + 2014 + ], + "Frontend": 0, + "Quality": 2, + "Icon": "duanjian", + "Addskill": 3020135, + "Replace": 0, + "Weight": 30, + "Title": "剑暴击增加", + "Describe": "剑类武器暴击+15%" }, { "ID": 90801, @@ -372,11 +406,11 @@ "Frontend": 0, "Quality": 2, "Icon": "tieqiang", - "Addskill": 3022016, + "Addskill": 3022030, "Replace": 0, "Weight": 60, "Title": "长柄伤害增加", - "Describe": "长柄伤害增加30%" + "Describe": "长柄类武器攻击+10%" }, { "ID": 90802, @@ -387,13 +421,98 @@ 2204 ], "Frontend": 0, - "Quality": 1, + "Quality": 2, "Icon": "tieqiang", - "Addskill": 3022017, + "Addskill": 3022031, "Replace": 0, "Weight": 60, "Title": "长柄生命增加", - "Describe": "长柄生命上限增加30%" + "Describe": "长柄类武器血量+10%" + }, + { + "ID": 90803, + "Carryingprops": [ + 2201, + 2202, + 2203, + 2204 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "tieqiang", + "Addskill": 3022032, + "Replace": 0, + "Weight": 60, + "Title": "长柄伤害增加", + "Describe": "长柄类武器攻击+20%" + }, + { + "ID": 90804, + "Carryingprops": [ + 2201, + 2202, + 2203, + 2204 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "tieqiang", + "Addskill": 3022033, + "Replace": 0, + "Weight": 60, + "Title": "长柄血量增加", + "Describe": "长柄类武器血量+20%" + }, + { + "ID": 90805, + "Carryingprops": [ + 2201, + 2202, + 2203, + 2204 + ], + "Frontend": 0, + "Quality": 2, + "Icon": "tieqiang", + "Addskill": 3022034, + "Replace": 0, + "Weight": 60, + "Title": "长柄暴击增加", + "Describe": "长柄类武器暴击+10%" + }, + { + "ID": 90806, + "Carryingprops": [ + 2201, + 2202, + 2203, + 2204 + ], + "Frontend": 0, + "Quality": 1, + "Icon": "tieqiang", + "Addskill": 3022035, + "Replace": 0, + "Weight": 60, + "Title": "长柄暴击增加", + "Describe": "长柄类武器暴击+15%" + }, + { + "ID": 90807, + "Carryingprops": [ + 2201, + 2202, + 2203, + 2204 + ], + "Frontend": 0, + "Quality": 2, + "Icon": "tieqiang", + "Addskill": 3022036, + "Replace": 0, + "Weight": 60, + "Title": "长柄攻速增加", + "Describe": "长柄类武器攻速+10%" }, { "ID": 90901, @@ -406,11 +525,11 @@ "Frontend": 0, "Quality": 2, "Icon": "mufazhang", - "Addskill": 3023016, + "Addskill": 3023030, "Replace": 0, "Weight": 60, "Title": "杖伤害增加", - "Describe": "仗伤害增加30%" + "Describe": "杖类武器攻击+10%" }, { "ID": 90902, @@ -421,13 +540,64 @@ 2304 ], "Frontend": 0, - "Quality": 1, + "Quality": 2, "Icon": "mufazhang", - "Addskill": 3023017, + "Addskill": 3023031, "Replace": 0, "Weight": 60, "Title": "杖生命增加", - "Describe": "仗生命上限增加30%" + "Describe": "杖类武器血量+10%" + }, + { + "ID": 90903, + "Carryingprops": [ + 2301, + 2302, + 2303, + 2304 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "mufazhang", + "Addskill": 3023032, + "Replace": 0, + "Weight": 60, + "Title": "杖伤害增加", + "Describe": "杖类武器攻击+20%" + }, + { + "ID": 90904, + "Carryingprops": [ + 2301, + 2302, + 2303, + 2304 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "mufazhang", + "Addskill": 3023033, + "Replace": 0, + "Weight": 60, + "Title": "杖生命增加", + "Describe": "杖类武器血量+20%" + }, + { + "ID": 90905, + "Carryingprops": [ + 2301, + 2302, + 2303, + 2304 + ], + "Frontend": 0, + "Quality": 2, + "Icon": "mufazhang", + "Addskill": 3023034, + "Replace": 0, + "Weight": 60, + "Title": "杖攻速增加", + "Describe": "杖类武器攻速+10%" }, { "ID": 91001, @@ -440,11 +610,11 @@ "Frontend": 0, "Quality": 2, "Icon": "mugong", - "Addskill": 3024016, + "Addskill": 3024030, "Replace": 0, "Weight": 60, "Title": "弓箭伤害增加", - "Describe": "弓箭伤害增加30%" + "Describe": "弓箭类武器攻击+10%" }, { "ID": 91002, @@ -455,13 +625,64 @@ 2404 ], "Frontend": 0, - "Quality": 1, + "Quality": 2, "Icon": "mugong", - "Addskill": 3024017, + "Addskill": 3024031, "Replace": 0, "Weight": 60, "Title": "弓箭生命增加", - "Describe": "弓箭生命上限增加30%" + "Describe": "弓箭类武器血量+10%" + }, + { + "ID": 91003, + "Carryingprops": [ + 2401, + 2402, + 2403, + 2404 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "mugong", + "Addskill": 3024032, + "Replace": 0, + "Weight": 60, + "Title": "弓箭伤害增加", + "Describe": "弓箭类武器攻击+20%" + }, + { + "ID": 91004, + "Carryingprops": [ + 2401, + 2402, + 2403, + 2404 + ], + "Frontend": 0, + "Quality": 3, + "Icon": "mugong", + "Addskill": 3024033, + "Replace": 0, + "Weight": 60, + "Title": "弓箭生命增加", + "Describe": "弓箭类武器血量+20%" + }, + { + "ID": 91005, + "Carryingprops": [ + 2401, + 2402, + 2403, + 2404 + ], + "Frontend": 0, + "Quality": 2, + "Icon": "mugong", + "Addskill": 3024034, + "Replace": 0, + "Weight": 60, + "Title": "弓箭攻速增加", + "Describe": "弓箭类武器攻速+10%" }, { "ID": 91101, @@ -474,11 +695,11 @@ "Frontend": 0, "Quality": 2, "Icon": "feibiao", - "Addskill": 3025016, + "Addskill": 3025030, "Replace": 0, "Weight": 60, "Title": "手里剑伤害增加", - "Describe": "手里剑伤害增加30%" + "Describe": "飞镖类武器攻击+10%" }, { "ID": 91102, @@ -489,13 +710,13 @@ 2504 ], "Frontend": 0, - "Quality": 1, + "Quality": 2, "Icon": "feibiao", - "Addskill": 3025017, + "Addskill": 3025031, "Replace": 0, "Weight": 60, "Title": "手里剑生命增加", - "Describe": "手里剑生命上限增加30%" + "Describe": "飞镖类武器血量+10%" }, { "ID": 91103, @@ -506,13 +727,13 @@ 2504 ], "Frontend": 0, - "Quality": 2, + "Quality": 3, "Icon": "feibiao", - "Addskill": 3025018, + "Addskill": 3025032, "Replace": 0, "Weight": 60, - "Title": "穿透", - "Describe": "手里剑箭穿透1" + "Title": "手里剑伤害增加", + "Describe": "飞镖类武器攻击+20%" }, { "ID": 91104, @@ -522,14 +743,14 @@ 2503, 2504 ], - "Frontend": 3025018, + "Frontend": 0, "Quality": 3, "Icon": "feibiao", - "Addskill": 0, - "Replace": 3025019, + "Addskill": 3025033, + "Replace": 0, "Weight": 60, - "Title": "穿透", - "Describe": "手里剑箭穿透2" + "Title": "手里剑生命增加", + "Describe": "飞镖类武器血量+20%" }, { "ID": 91201, @@ -541,7 +762,7 @@ "Icon": "duanjian", "Addskill": 3020111, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个剑" }, @@ -555,7 +776,7 @@ "Icon": "duanjian", "Addskill": 3021011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个重甲" }, @@ -569,7 +790,7 @@ "Icon": "duanjian", "Addskill": 3022011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个长柄" }, @@ -583,7 +804,7 @@ "Icon": "duanjian", "Addskill": 3023011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个杖" }, @@ -597,7 +818,7 @@ "Icon": "duanjian", "Addskill": 3024011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个弓箭" }, @@ -611,7 +832,7 @@ "Icon": "duanjian", "Addskill": 3025011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个轻甲" }, @@ -625,7 +846,7 @@ "Icon": "duanjian", "Addskill": 3026011, "Replace": 0, - "Weight": 50, + "Weight": 100, "Title": "获得", "Describe": "获得一个手里剑" } diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_skillstructure.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_skillstructure.json index 3ec233a2..f0501fe6 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_skillstructure.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_skillstructure.json @@ -1,7 +1,7 @@ [ { "SkillbodyID": 60400111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, @@ -9,7 +9,7 @@ }, { "SkillbodyID": 60800111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, @@ -17,7 +17,7 @@ }, { "SkillbodyID": 60900111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, @@ -25,7 +25,7 @@ }, { "SkillbodyID": 61300111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, @@ -33,7 +33,7 @@ }, { "SkillbodyID": 61700111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, @@ -41,7 +41,7 @@ }, { "SkillbodyID": 62000111, - "Skillbodyicon": "shitou", + "Skillbodyicon": "huoqiu", "Skillbodyeffect": "", "Skillbodytime": 100, "Skillbody": 0, diff --git a/Blacksmith/Assets/Resources/Data/blacksmithdata_weaponattribute.json b/Blacksmith/Assets/Resources/Data/blacksmithdata_weaponattribute.json index c6b493ed..2ded4f18 100644 --- a/Blacksmith/Assets/Resources/Data/blacksmithdata_weaponattribute.json +++ b/Blacksmith/Assets/Resources/Data/blacksmithdata_weaponattribute.json @@ -22,7 +22,7 @@ "Upgradegold": 420, "Attack": 15, "HP": 130, - "Getskill": 3020116, + "Getskill": 3020140, "Unlock": 0 }, { @@ -74,7 +74,7 @@ "Upgradegold": 1200, "Attack": 62, "HP": 545, - "Getskill": 3020116, + "Getskill": 3020142, "Unlock": 0 }, { @@ -126,7 +126,7 @@ "Upgradegold": 1920, "Attack": 130, "HP": 1135, - "Getskill": 3020116, + "Getskill": 3020143, "Unlock": 0 }, { @@ -542,7 +542,7 @@ "Upgradegold": 420, "Attack": 0, "HP": 1590, - "Getskill": 0, + "Getskill": 3021040, "Unlock": 0 }, { @@ -594,7 +594,7 @@ "Upgradegold": 1200, "Attack": 0, "HP": 8115, - "Getskill": 0, + "Getskill": 3021041, "Unlock": 0 }, { @@ -646,7 +646,7 @@ "Upgradegold": 1920, "Attack": 0, "HP": 17420, - "Getskill": 0, + "Getskill": 3021042, "Unlock": 0 }, { @@ -1062,7 +1062,7 @@ "Upgradegold": 420, "Attack": 21, "HP": 740, - "Getskill": 0, + "Getskill": 3022040, "Unlock": 0 }, { @@ -1114,7 +1114,7 @@ "Upgradegold": 1200, "Attack": 92, "HP": 3705, - "Getskill": 0, + "Getskill": 3022041, "Unlock": 0 }, { @@ -1166,7 +1166,7 @@ "Upgradegold": 1920, "Attack": 193, "HP": 7935, - "Getskill": 0, + "Getskill": 3022042, "Unlock": 0 }, { @@ -1582,7 +1582,7 @@ "Upgradegold": 420, "Attack": 12, "HP": 455, - "Getskill": 0, + "Getskill": 3023040, "Unlock": 0 }, { @@ -1634,7 +1634,7 @@ "Upgradegold": 1200, "Attack": 47, "HP": 2235, - "Getskill": 0, + "Getskill": 3023041, "Unlock": 0 }, { @@ -1686,7 +1686,7 @@ "Upgradegold": 1920, "Attack": 98, "HP": 4770, - "Getskill": 0, + "Getskill": 3023042, "Unlock": 0 }, { @@ -2102,7 +2102,7 @@ "Upgradegold": 420, "Attack": 26, "HP": 455, - "Getskill": 0, + "Getskill": 3021040, "Unlock": 0 }, { @@ -2154,7 +2154,7 @@ "Upgradegold": 1200, "Attack": 121, "HP": 2235, - "Getskill": 0, + "Getskill": 3021041, "Unlock": 0 }, { @@ -2206,7 +2206,7 @@ "Upgradegold": 1920, "Attack": 256, "HP": 4770, - "Getskill": 0, + "Getskill": 3021042, "Unlock": 0 }, { @@ -2602,7 +2602,7 @@ { "ID": 1302501, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 1, "Upgrade": 30250101, "Upgradenumber": 5, @@ -2615,20 +2615,20 @@ { "ID": 1302502, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 2, "Upgrade": 30250101, "Upgradenumber": 7, "Upgradegold": 420, "Attack": 32, "HP": 175, - "Getskill": 0, + "Getskill": 3025040, "Unlock": 0 }, { "ID": 1302503, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 3, "Upgrade": 30250101, "Upgradenumber": 11, @@ -2641,7 +2641,7 @@ { "ID": 1302504, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 4, "Upgrade": 30250101, "Upgradenumber": 14, @@ -2654,7 +2654,7 @@ { "ID": 1302505, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 5, "Upgrade": 30250101, "Upgradenumber": 17, @@ -2667,20 +2667,20 @@ { "ID": 1302506, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 6, "Upgrade": 30250101, "Upgradenumber": 20, "Upgradegold": 1200, "Attack": 150, "HP": 765, - "Getskill": 0, + "Getskill": 3025041, "Unlock": 0 }, { "ID": 1302507, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 7, "Upgrade": 30250101, "Upgradenumber": 23, @@ -2693,7 +2693,7 @@ { "ID": 1302508, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 8, "Upgrade": 30250101, "Upgradenumber": 26, @@ -2706,7 +2706,7 @@ { "ID": 1302509, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 9, "Upgrade": 30250101, "Upgradenumber": 29, @@ -2719,20 +2719,20 @@ { "ID": 1302510, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 10, "Upgrade": 30250101, "Upgradenumber": 32, "Upgradegold": 1920, "Attack": 319, "HP": 1610, - "Getskill": 0, + "Getskill": 3025042, "Unlock": 0 }, { "ID": 1302511, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 11, "Upgrade": 30250101, "Upgradenumber": 35, @@ -2745,7 +2745,7 @@ { "ID": 1302512, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 12, "Upgrade": 30250101, "Upgradenumber": 38, @@ -2758,7 +2758,7 @@ { "ID": 1302513, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 13, "Upgrade": 30250101, "Upgradenumber": 41, @@ -2771,7 +2771,7 @@ { "ID": 1302514, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 14, "Upgrade": 30250101, "Upgradenumber": 44, @@ -2784,7 +2784,7 @@ { "ID": 1302515, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 15, "Upgrade": 30250101, "Upgradenumber": 47, @@ -2797,7 +2797,7 @@ { "ID": 1302516, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 16, "Upgrade": 30250101, "Upgradenumber": 50, @@ -2810,7 +2810,7 @@ { "ID": 1302517, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 17, "Upgrade": 30250101, "Upgradenumber": 52, @@ -2823,7 +2823,7 @@ { "ID": 1302518, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 18, "Upgrade": 30250101, "Upgradenumber": 56, @@ -2836,7 +2836,7 @@ { "ID": 1302519, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 19, "Upgrade": 30250101, "Upgradenumber": 59, @@ -2849,7 +2849,7 @@ { "ID": 1302520, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 20, "Upgrade": 30250101, "Upgradenumber": 62, @@ -2862,7 +2862,7 @@ { "ID": 1302521, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 21, "Upgrade": 30250101, "Upgradenumber": 65, @@ -2875,7 +2875,7 @@ { "ID": 1302522, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 22, "Upgrade": 30250101, "Upgradenumber": 68, @@ -2888,7 +2888,7 @@ { "ID": 1302523, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 23, "Upgrade": 30250101, "Upgradenumber": 71, @@ -2901,7 +2901,7 @@ { "ID": 1302524, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 24, "Upgrade": 30250101, "Upgradenumber": 74, @@ -2914,7 +2914,7 @@ { "ID": 1302525, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 25, "Upgrade": 30250101, "Upgradenumber": 77, @@ -2927,7 +2927,7 @@ { "ID": 1302526, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 26, "Upgrade": 30250101, "Upgradenumber": 80, @@ -2940,7 +2940,7 @@ { "ID": 1302527, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 27, "Upgrade": 30250101, "Upgradenumber": 83, @@ -2953,7 +2953,7 @@ { "ID": 1302528, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 28, "Upgrade": 30250101, "Upgradenumber": 86, @@ -2966,7 +2966,7 @@ { "ID": 1302529, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 29, "Upgrade": 30250101, "Upgradenumber": 89, @@ -2979,7 +2979,7 @@ { "ID": 1302530, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 30, "Upgrade": 30250101, "Upgradenumber": 92, @@ -2992,7 +2992,7 @@ { "ID": 1302531, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 31, "Upgrade": 30250101, "Upgradenumber": 95, @@ -3005,7 +3005,7 @@ { "ID": 1302532, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 32, "Upgrade": 30250101, "Upgradenumber": 98, @@ -3018,7 +3018,7 @@ { "ID": 1302533, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 33, "Upgrade": 30250101, "Upgradenumber": 101, @@ -3031,7 +3031,7 @@ { "ID": 1302534, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 34, "Upgrade": 30250101, "Upgradenumber": 104, @@ -3044,7 +3044,7 @@ { "ID": 1302535, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 35, "Upgrade": 30250101, "Upgradenumber": 107, @@ -3057,7 +3057,7 @@ { "ID": 1302536, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 36, "Upgrade": 30250101, "Upgradenumber": 110, @@ -3070,7 +3070,7 @@ { "ID": 1302537, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 37, "Upgrade": 30250101, "Upgradenumber": 113, @@ -3083,7 +3083,7 @@ { "ID": 1302538, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 38, "Upgrade": 30250101, "Upgradenumber": 116, @@ -3096,7 +3096,7 @@ { "ID": 1302539, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 39, "Upgrade": 30250101, "Upgradenumber": 119, @@ -3109,7 +3109,7 @@ { "ID": 1302540, "Arms": 302501, - "Name": "弩", + "Name": "飞镖", "Level": 40, "Upgrade": 30250101, "Upgradenumber": 0, @@ -3142,7 +3142,7 @@ "Upgradegold": 420, "Attack": 0, "HP": 1590, - "Getskill": 0, + "Getskill": 3026040, "Unlock": 0 }, { @@ -3194,7 +3194,7 @@ "Upgradegold": 1200, "Attack": 0, "HP": 8115, - "Getskill": 0, + "Getskill": 3026041, "Unlock": 0 }, { @@ -3246,7 +3246,7 @@ "Upgradegold": 1920, "Attack": 0, "HP": 17420, - "Getskill": 0, + "Getskill": 3026042, "Unlock": 0 }, { diff --git a/Blacksmith/Assets/Scenes/SampleScene.unity b/Blacksmith/Assets/Scenes/SampleScene.unity index 74dc38e4..18a4bdd5 100644 --- a/Blacksmith/Assets/Scenes/SampleScene.unity +++ b/Blacksmith/Assets/Scenes/SampleScene.unity @@ -889,26 +889,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: -0.00000004371139 - objectReference: {fileID: 0} - - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 2534.0264 - objectReference: {fileID: 0} - - target: {fileID: 198369439937822240, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000616307 - objectReference: {fileID: 0} - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -925,150 +905,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 2.019481 - objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: -0.000000014108153 - objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000032498758 - objectReference: {fileID: 0} - - target: {fileID: 824084434105460965, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 824084434105460965, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 - objectReference: {fileID: 0} - - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 2.019481 - objectReference: {fileID: 0} - - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: -0.000000008659961 - objectReference: {fileID: 0} - - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000032498758 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 0.6213826 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000057662152 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 359.99997 - objectReference: {fileID: 0} - - target: {fileID: 1923300188990817061, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000067430556 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 1.0000001 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000007728171 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 359.99997 - objectReference: {fileID: 0} - - target: {fileID: 2446255129621035987, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.000005564288 - objectReference: {fileID: 0} - - target: {fileID: 2687063965730892539, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2687063965730892539, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2703744668847977621, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 2703744668847977621, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 - objectReference: {fileID: 0} - - target: {fileID: 2810660058786452663, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 2810660058786452663, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.00001183105 - objectReference: {fileID: 0} - - target: {fileID: 3005541637376198884, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3005541637376198884, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3254490145894505257, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3254490145894505257, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3254490145894505257, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1085,14 +921,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3491874388263843074, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 3491874388263843074, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 - objectReference: {fileID: 0} - target: {fileID: 3504301148192295494, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1101,106 +929,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3535150357896660372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.000020235777 - objectReference: {fileID: 0} - - target: {fileID: 3924915755643395529, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 3924915755643395529, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.00001183105 - objectReference: {fileID: 0} - - target: {fileID: 4086530264551283400, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4086530264551283400, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4202168476399996023, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4356588315664731639, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 4356588315664731639, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 - objectReference: {fileID: 0} - - target: {fileID: 4392934527185610438, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 31.926352 - objectReference: {fileID: 0} - - target: {fileID: 4392934527185610438, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -358.35217 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 0.62138253 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.00000005063816 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -1.4701469e-12 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 0.5937905 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000040369912 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000003553884 - objectReference: {fileID: 0} - - target: {fileID: 4892172892484661290, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4892172892484661290, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4892172892484661290, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5101466207984114834, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1209,26 +937,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y + - target: {fileID: 5610340814941642952, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} + propertyPath: m_Size value: 1 objectReference: {fileID: 0} - - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: -0.00000004371139 - objectReference: {fileID: 0} - - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z + - target: {fileID: 5794036599742186259, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} + propertyPath: m_Value value: 1 objectReference: {fileID: 0} - - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 2534.0264 - objectReference: {fileID: 0} - - target: {fileID: 5373557834658095386, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000037788843 - objectReference: {fileID: 0} - target: {fileID: 5828942971782581090, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1237,45 +953,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 0.5937901 - objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.00000003891512 - objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00006 - objectReference: {fileID: 0} - - target: {fileID: 6413101721776649384, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000046014075 - objectReference: {fileID: 0} - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.00004157424 + value: 0.000017166138 objectReference: {fileID: 0} - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.0002417051 + value: -0.00012395334 objectReference: {fileID: 0} - - target: {fileID: 7353981888873689265, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.000020235777 + - target: {fileID: 7637600488991758092, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} + propertyPath: m_Size + value: 1 objectReference: {fileID: 0} - target: {fileID: 7798967289364784859, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchorMax.x @@ -1285,81 +977,17 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7828562722598263467, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 7828562722598263467, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 - objectReference: {fileID: 0} - - target: {fileID: 8503480254810895229, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 2534.0264 - objectReference: {fileID: 0} - - target: {fileID: 8503480254810895229, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000616307 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.x - value: 1.0000001 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000009365342 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 359.99997 - objectReference: {fileID: 0} - - target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000010355754 - objectReference: {fileID: 0} - - target: {fileID: 8734534549119924968, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8734534549119924968, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8740125470161128311, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_Name value: Canvas objectReference: {fileID: 0} - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000034615397 + value: -0.000049591064 objectReference: {fileID: 0} - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.0003009931 - objectReference: {fileID: 0} - - target: {fileID: 8849191488238675942, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 2534.0264 - objectReference: {fileID: 0} - - target: {fileID: 8849191488238675942, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000037788843 - objectReference: {fileID: 0} - - target: {fileID: 8906768314333973591, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 360.00003 - objectReference: {fileID: 0} - - target: {fileID: 8906768314333973591, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000118310445 + value: -0.0008746868 objectReference: {fileID: 0} - target: {fileID: 9144618406897127126, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} propertyPath: m_Pivot.x diff --git a/Blacksmith/Assets/Script/Battle/BattleManager.cs b/Blacksmith/Assets/Script/Battle/BattleManager.cs index ea054dea..398772d2 100644 --- a/Blacksmith/Assets/Script/Battle/BattleManager.cs +++ b/Blacksmith/Assets/Script/Battle/BattleManager.cs @@ -290,7 +290,7 @@ public class BattleManager : MonoBehaviour { foreach (var p in playerItems) { - if (p.player!=null) + if (p!=null&&p.player!=null) { PrefabPool.ins.RecycleObj(p.player.gameObject); p.player = null; diff --git a/Blacksmith/Assets/Script/DataManager.cs b/Blacksmith/Assets/Script/DataManager.cs index 6bdcc694..93ca6f10 100644 --- a/Blacksmith/Assets/Script/DataManager.cs +++ b/Blacksmith/Assets/Script/DataManager.cs @@ -37,9 +37,18 @@ public static class DataManager } private static Dictionary itemDictionary; + public static int GuidInt(int key) + { + return (int)LoadValue(typeof(int), "guidItem"+key); + } + + public static void SaveGuidItem(int key,int num) + { + SaveValue("guidItem" + key, num); + } public static int GetItem(int id) { - return ItemDictionary.ContainsKey(id) ? ItemDictionary[id] : 0; + return (ItemDictionary.ContainsKey(id) ? ItemDictionary[id] : 0)+GuidInt(id); //return ItemDatas.FirstOrDefault(vaItemData => vaItemData.item.id == id); } @@ -328,13 +337,13 @@ public static class DataManager } - private static void SetPrefab(string key ,int num) + public static void SetPrefab(string key ,int num) { SaveValue(key,num); } - private static int GetPrefab(string key) + public static int GetPrefab(string key) { return (int)LoadValue(typeof(int),key); } diff --git a/Blacksmith/Assets/Script/GameSystem.cs b/Blacksmith/Assets/Script/GameSystem.cs index 6352fa2c..634fb5a5 100644 --- a/Blacksmith/Assets/Script/GameSystem.cs +++ b/Blacksmith/Assets/Script/GameSystem.cs @@ -42,12 +42,19 @@ public class GameSystem : MonoBehaviour { DataManager.SetLevelLock(int.Parse(JsonTab.Instance.tables.Main.Get(20).ConstantValue),true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(21).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(21).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(22).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(22).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(23).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(23).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(24).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(24).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(25).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(25).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(26).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(26).ConstantValue)); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(27).ConstantValue), true); + UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(27).ConstantValue)); DataManager.SaveItemUnLock(1, true); DataManager.SaveItemUnLock(2, true); DataManager.SaveItemUnLock(3, true); @@ -61,6 +68,32 @@ public class GameSystem : MonoBehaviour DataManager.SaveDrawLevel(302401, 1); DataManager.SaveDrawLevel(302501, 1); DataManager.SaveDrawLevel(302601, 1); + DataManager.SaveItem(1011,int.Parse(JsonTab.Instance.tables.Main.Get(28).ConstantValue)); + DataManager.SaveItem(1021,int.Parse(JsonTab.Instance.tables.Main.Get(29).ConstantValue)); + DataManager.SaveItem(1031,int.Parse(JsonTab.Instance.tables.Main.Get(30).ConstantValue)); + DataManager.SaveItem(1041,int.Parse(JsonTab.Instance.tables.Main.Get(31).ConstantValue)); + DataManager.SaveItem(1051,int.Parse(JsonTab.Instance.tables.Main.Get(32).ConstantValue)); + } + + private void UnlockItem(int id) + { + var data = JsonTab.Instance.tables.CraftingRecipes.Get(id); + if (data.Levelprops1!=0) + { + DataManager.SaveItemUnLock(data.Levelprops1,true); + } + if (data.Levelprops2!=0) + { + DataManager.SaveItemUnLock(data.Levelprops2,true); + } + if (data.Levelprops3!=0) + { + DataManager.SaveItemUnLock(data.Levelprops3,true); + } + if (data.Levelprops4!=0) + { + DataManager.SaveItemUnLock(data.Levelprops4,true); + } } private void Awake() { @@ -120,6 +153,10 @@ public class GameSystem : MonoBehaviour SaveFirstID(); UIMgr.ins.OpenForgePanel(); forgePanel.ResetGold(); + if (DataManager.GetPrefab("firstGuideV1")!=1) + { + uiMgr.OpenFirstGuidePanel(); + } // abManager.InitAsset(() => // { // if (!DataManager.GetFirst()) @@ -180,6 +217,7 @@ public class GameSystem : MonoBehaviour /// public void StartNpcData() { + _npcBuyDatas.Clear(); foreach (var data in JsonTab.Instance.tables.Item.DataList) { if (DataManager.GetItemUnLock(data.ID) && data.NPC.Count != 0) @@ -195,6 +233,21 @@ public class GameSystem : MonoBehaviour SaveFirstID(); } + public void GuidData() + { + NPCBuyData npcBuyData = new NPCBuyData(); + npcBuyData.buyID = 2011; + npcBuyData.npcID = 50007; + _npcBuyDatas.Add(npcBuyData); + NPCBuyData npcBuyData1 = new NPCBuyData(); + npcBuyData1.buyID = 2011; + npcBuyData1.npcID = 50008; + _npcBuyDatas.Add(npcBuyData); + DataManager.SaveGuidItem(1011,3); + nowTime = 0; + SaveFirstID(); + } + public void SaveNPCbo(bool bo) { getNpc = bo; @@ -366,4 +419,12 @@ public class GameSystem : MonoBehaviour } } } + + public void GuideV2() + { + var npcData = _npcBuyDatas[0]; + _npcBuyDatas.Remove(_npcBuyDatas[0]); + SaveFirstID(); + forgePanel.SetData(true,npcData); + } } \ No newline at end of file diff --git a/Blacksmith/Assets/Script/UI/BattlePanel.cs b/Blacksmith/Assets/Script/UI/BattlePanel.cs index 575ef30c..ce918421 100644 --- a/Blacksmith/Assets/Script/UI/BattlePanel.cs +++ b/Blacksmith/Assets/Script/UI/BattlePanel.cs @@ -113,7 +113,7 @@ public class BattlePanel : MonoBehaviour ResetGold(); } - private void OpenCombatPanel() + public void OpenCombatPanel() { DataManager.RemovePhysical(); @@ -234,14 +234,20 @@ public class BattlePanel : MonoBehaviour private void OpenVideoWeaponryEvent() { - BattleManager.ins.OpenVideoWeaponryEvent(); - ResetReadyPanel(); + ADSystem.getInstance().PlayAd(() => + { + BattleManager.ins.OpenVideoWeaponryEvent(); + ResetReadyPanel(); + }); } private void OpenVideoSoldierEvent() { - BattleManager.ins.OpenVideoSoldierEvent(); - ResetReadyPanel(); + ADSystem.getInstance().PlayAd(() => + { + BattleManager.ins.OpenVideoSoldierEvent(); + ResetReadyPanel(); + }); } #endregion diff --git a/Blacksmith/Assets/Script/UI/CombatPanel.cs b/Blacksmith/Assets/Script/UI/CombatPanel.cs index a8cd86c7..80b9962d 100644 --- a/Blacksmith/Assets/Script/UI/CombatPanel.cs +++ b/Blacksmith/Assets/Script/UI/CombatPanel.cs @@ -49,6 +49,10 @@ public class CombatPanel : MonoBehaviour _rogenPanel.gameObject.SetActive(true); _rogenPanel.SetResetIndex(1); _rogenPanel.InitData(); + if (DataManager.GetPrefab("firstGuideV3")!=1) + { + UIMgr.ins.OpenFirstGuidePanelv3(); + } } public void CloseRogenPanel() diff --git a/Blacksmith/Assets/Script/UI/CombatPanel/RogenItem.cs b/Blacksmith/Assets/Script/UI/CombatPanel/RogenItem.cs index aa3150a8..94b24c82 100644 --- a/Blacksmith/Assets/Script/UI/CombatPanel/RogenItem.cs +++ b/Blacksmith/Assets/Script/UI/CombatPanel/RogenItem.cs @@ -56,7 +56,7 @@ public class RogenItem : MonoBehaviour } - private void SendEvent() + public void SendEvent() { BattleManager.ins.SetRogen(skillData); UIMgr.ins.CloseRogenPanel(); diff --git a/Blacksmith/Assets/Script/UI/ForgePanel.cs b/Blacksmith/Assets/Script/UI/ForgePanel.cs index e87c1480..585bedba 100644 --- a/Blacksmith/Assets/Script/UI/ForgePanel.cs +++ b/Blacksmith/Assets/Script/UI/ForgePanel.cs @@ -115,8 +115,28 @@ public class ForgePanel : MonoBehaviour void GameStart() { + if (DataManager.GetPhysical()>=5) + { + DataManager.RemovePhysical(); + ResetGold(); + startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false); + startAni.AnimationState.Complete += StartEvent; + } + } + + public void GuideV1() + { + DataManager.RemovePhysical(); + ResetGold(); startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false); - startAni.AnimationState.Complete += StartEvent; + startAni.AnimationState.Complete += GuideV1b; + } + + public void GuideV1b(TrackEntry trackentry) + { + startAni.AnimationState.Complete -= GuideV1b; + GameSystem.ins.StartNpcData(); + openParent.SetActive(false); } void CloseStore() @@ -139,6 +159,16 @@ public class ForgePanel : MonoBehaviour GameSystem.ins.Crafting(bo); }); } + + public void CraftGuideEvent(Action action) + { + _craftingPanel.gameObject.SetActive(true); + _craftingPanel.StartOpen(true, (bool bo) => + { + GameSystem.ins.Crafting(bo); + action?.Invoke(); + }); + } public void ResetCrafting(int id,int npcID) { getCrafting.SaveIcon(id); diff --git a/Blacksmith/Assets/Script/UI/GuidePanel.cs b/Blacksmith/Assets/Script/UI/GuidePanel.cs new file mode 100644 index 00000000..f1de4298 --- /dev/null +++ b/Blacksmith/Assets/Script/UI/GuidePanel.cs @@ -0,0 +1,254 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using UnityEngine; +using UnityEngine.UI; + +public class GuidePanel : MonoBehaviour +{ + [SerializeField] private List textList; + [SerializeField] private RectTransform seleTra; + [SerializeField] private Button eventButton; + [SerializeField] private ForgePanel _forgePanel; + [SerializeField] private BattlePanel _battlePanel; + [SerializeField] private RogenItem _rogenItem; + [SerializeField] private Image _sceleImage; + [SerializeField] private Text _text; + [SerializeField] private Text _text2; + [SerializeField] private GameObject crafting; + [SerializeField] private GameObject cra2; + [SerializeField] private RectTransform hand; + private Tween ani; + private Tween ani2; + [SerializeField] private RectTransform lock1; + [SerializeField] private RectTransform lock2; + [SerializeField] private RectTransform lock2c1; + [SerializeField] private RectTransform lock3; + [SerializeField] private RectTransform lock4; + [SerializeField] private RectTransform lock5; + [SerializeField] private RectTransform lock5c1; + [SerializeField] private RectTransform lock5c2; + [SerializeField] private RectTransform lock6; + [SerializeField] private RectTransform lock7; + [SerializeField] private RectTransform lock8; + private void Start() + { + + } + + public void GLock1() + { + _sceleImage.gameObject.SetActive(false); + _text.text = "点击开店"; + _text.GetComponent().position = textList[0].position; + _text2.gameObject.SetActive(false); + seleTra.position = lock1.position; + eventButton.onClick.AddListener(Event1); + } + + private void Event1() + { + eventButton.onClick.RemoveListener(Event1); + seleTra.position = lock2.position; + eventButton.onClick.AddListener(SaveE1); + _sceleImage.gameObject.SetActive(true); + _text.text = "拖拽到锻造栏"; + _text.GetComponent().position = textList[3].position; + _forgePanel.GuideV1(); + var data = JsonTab.Instance.tables.Item.Get(1011); + _sceleImage.sprite = AssetBundleManager.ins.Sprite(data.Icon, AtlasType.ItemIcon); + _sceleImage.GetComponent().position = lock2.position; + + ani2=_sceleImage.GetComponent().DOMove(lock2c1.position, 1f).SetLoops(-1); + hand.localPosition = Vector3.zero; + ani.Kill(); + ani= hand.GetComponent().DOMove(lock2c1.position, 1f).SetLoops(-1); + } + + private void SaveE1() + { + GameSystem.ins.drawingManager.itemsSlot[0] = 1011; + _forgePanel.ResetSlotItem(); + eventButton.onClick.RemoveListener(SaveE1); + eventButton.onClick.AddListener(SaveE2); + } + private void SaveE2() + { + GameSystem.ins.drawingManager.itemsSlot[1] = 1011; + _forgePanel.ResetSlotItem(); + eventButton.onClick.RemoveListener(SaveE2); + eventButton.onClick.AddListener(SaveE3); + } + private void SaveE3() + { + GameSystem.ins.drawingManager.itemsSlot[2] = 1011; + _forgePanel.ResetSlotItem(); + eventButton.onClick.RemoveListener(SaveE3); + _sceleImage.gameObject.SetActive(false); + ani.Kill(); + ani= hand.GetComponent().DOLocalMove(Vector3.zero, 0.1f); + _text.text = "点击锻造"; + _text.GetComponent().position = textList[0].position; + seleTra.position = lock3.position; + eventButton.onClick.AddListener(Event2); + } + + private void Event2() + { + eventButton.onClick.RemoveListener(Event2); + eventButton.gameObject.SetActive(false); + GetComponent().enabled = false; + seleTra.gameObject.SetActive(false); + _text2.gameObject.SetActive(true); + _text2.text = "在红色区域点击加速"; + _forgePanel.CraftGuideEvent(() => + { + Event3(); + }); + } + + private void Event3() + { + seleTra.gameObject.SetActive(true); + seleTra.position = lock2c1.position; + eventButton.onClick.AddListener(Event4); + eventButton.gameObject.SetActive(true); + _text2.gameObject.SetActive(false); + GetComponent().enabled = true; + _text.text = "点击任意区域关闭页面"; + _text.GetComponent().position = textList[0].position; + } + + private void Event4() + { + seleTra.position = lock5.position; + crafting.SetActive(false); + eventButton.onClick.RemoveListener(Event4); + eventButton.onClick.AddListener(Event4c1); + _text.text = "拖拽铁剑给客户"; + _text.GetComponent().position = textList[1].position; + _sceleImage.gameObject.SetActive(true); + var data = JsonTab.Instance.tables.Item.Get(2011); + _sceleImage.sprite = AssetBundleManager.ins.Sprite(data.Icon, AtlasType.ItemIcon); + ani2.Kill(); + _sceleImage.GetComponent().position = lock5.position; + ani2=_sceleImage.GetComponent().DOMove(lock5c1.position, 1f).SetLoops(-1); + hand.localPosition = Vector3.zero; + ani.Kill(); + ani=hand.GetComponent().DOMove(lock5c1.position, 1f).SetLoops(-1); + } + + private void Event4c1() + { + _sceleImage.gameObject.SetActive(false); + seleTra.position = lock2c1.position; + ani.Kill(); + ani= hand.GetComponent().DOLocalMove(Vector3.zero, 0.1f); + eventButton.onClick.RemoveListener(Event4c1); + eventButton.onClick.AddListener(Event5); + GameSystem.ins.GuideV2(); + _text.text = "点击关闭"; + _text.GetComponent().position = textList[0].position; + } + private void Event5() + { + seleTra.position = lock4.position; + cra2.SetActive(false); + eventButton.onClick.RemoveListener(Event5); + eventButton.onClick.AddListener(Event6); + _text.text = "点击关店"; + _text.GetComponent().position = textList[0].position; + } + + private void Event6() + { + seleTra.position = lock5c2.position; + eventButton.onClick.RemoveListener(Event6); + GameSystem.ins.CloseStore(); + eventButton.onClick.AddListener(Event6c1); + } + private void Event6c1() + { + eventButton.onClick.RemoveListener(Event6c1); + UIMgr.ins.OpenBattlePanel(); + DataManager.SetPrefab("firstGuideV1",1); + } + public void Event7() + { + _sceleImage.gameObject.SetActive(false); + _text2.gameObject.SetActive(false); + seleTra.position = lock6.position; + _text.text = "点击开始进入关卡"; + _text.GetComponent().position = textList[0].position; + eventButton.onClick.AddListener(Event8); + } + private void Event8() + { + eventButton.onClick.RemoveListener(Event8); + seleTra.position = lock7.position; + _text.text = "点击放置武器"; + _text.GetComponent().position = textList[0].position; + DataManager.AddItem(2011,3); + _battlePanel.OpenCombatPanel(); + eventButton.onClick.AddListener(Event9); + } + private void Event9() + { + eventButton.onClick.RemoveListener(Event9); + BattleManager.ins.GetItemNum(2011,out var itemNum); + if (DataManager.GetItem(2011) - itemNum-1>=0) + { + BattleManager.ins.AddItem(2011,out bool bo); + UIMgr.ins.ResetBattleReadyPanel(); + } + eventButton.onClick.AddListener(Event10); + } + private void Event10() + { + eventButton.onClick.RemoveListener(Event10); + BattleManager.ins.GetItemNum(2011,out var itemNum); + if (DataManager.GetItem(2011) - itemNum-1>=0) + { + BattleManager.ins.AddItem(2011,out bool bo); + UIMgr.ins.ResetBattleReadyPanel(); + } + eventButton.onClick.AddListener(Event11); + } + private void Event11() + { + eventButton.onClick.RemoveListener(Event11); + BattleManager.ins.GetItemNum(2011,out var itemNum); + if (DataManager.GetItem(2011) - itemNum-1>=0) + { + BattleManager.ins.AddItem(2011,out bool bo); + UIMgr.ins.ResetBattleReadyPanel(); + } + seleTra.position = lock8.position; + eventButton.onClick.AddListener(Event12); + } + private void Event12() + { + eventButton.onClick.RemoveListener(Event12); + gameObject.SetActive(false); + BattleManager.ins.StartBattle(); + DataManager.SetPrefab("firstGuideV2",1); + } + public void Event13() + { + _sceleImage.gameObject.SetActive(false); + _text2.gameObject.SetActive(false); + seleTra.position = _rogenItem.transform.position; + _text.text = "点击随机技能"; + _text.GetComponent().position = textList[0].position; + eventButton.onClick.AddListener(Event14); + } + public void Event14() + { + gameObject.SetActive(false); + _rogenItem.SendEvent(); + eventButton.onClick.RemoveListener(Event14); + DataManager.SetPrefab("firstGuideV3",1); + } +} + diff --git a/Blacksmith/Assets/Script/UI/GuidePanel.cs.meta b/Blacksmith/Assets/Script/UI/GuidePanel.cs.meta new file mode 100644 index 00000000..d0cbc62e --- /dev/null +++ b/Blacksmith/Assets/Script/UI/GuidePanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 41263223f8a140e48aa2e010911737a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Script/UI/SwithPanel.cs b/Blacksmith/Assets/Script/UI/SwithPanel.cs index 4ff172e9..84631b41 100644 --- a/Blacksmith/Assets/Script/UI/SwithPanel.cs +++ b/Blacksmith/Assets/Script/UI/SwithPanel.cs @@ -15,6 +15,7 @@ public class SwithPanel : MonoBehaviour [SerializeField] private Button shopButton; [SerializeField] private Button battleButton; + [SerializeField] private List _gameObjects; // Start is called before the first frame update void Start() @@ -63,4 +64,13 @@ public class SwithPanel : MonoBehaviour { UIMgr.ins.OpenBattlePanel(); } + + public void SetIndex(int index) + { + foreach (var gameObject in _gameObjects) + { + gameObject.SetActive(false); + } + _gameObjects[index].SetActive(true); + } } diff --git a/Blacksmith/Assets/Script/UI/UIMgr.cs b/Blacksmith/Assets/Script/UI/UIMgr.cs index 9503fd89..a72b17a9 100644 --- a/Blacksmith/Assets/Script/UI/UIMgr.cs +++ b/Blacksmith/Assets/Script/UI/UIMgr.cs @@ -18,6 +18,7 @@ public class UIMgr : MonoBehaviour [SerializeField] private StorePanel storePanel; [SerializeField] private CombatPanel combatPanel; [SerializeField] private EndPanel endPanel; + [SerializeField] private GuidePanel guidePanel; private void Awake() { @@ -39,6 +40,7 @@ public class UIMgr : MonoBehaviour combatPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false); forgePanel.Close(); + swithPanel.SetIndex(2); } public void OpenBattlePanel() @@ -51,6 +53,12 @@ public class UIMgr : MonoBehaviour combatPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false); battlePanel.ResetLevelID(); + if (DataManager.GetPrefab("firstGuideV2")!=1) + { + guidePanel.gameObject.SetActive(true); + guidePanel.Event7(); + } + swithPanel.SetIndex(3); } public void OpenDrawingPanel() @@ -63,6 +71,7 @@ public class UIMgr : MonoBehaviour combatPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false); drawingPanel.OpenPanel(); + swithPanel.SetIndex(1); } public void OpenStorePanel() @@ -75,6 +84,7 @@ public class UIMgr : MonoBehaviour combatPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false); storePanel.StartPanel(); + swithPanel.SetIndex(0); } /// /// 战斗过程界面 @@ -132,8 +142,17 @@ public class UIMgr : MonoBehaviour { combatPanel.ResetExp(); } - + public void OpenFirstGuidePanel() + { + guidePanel.gameObject.SetActive(true); + guidePanel.GLock1(); + } + public void OpenFirstGuidePanelv3() + { + guidePanel.gameObject.SetActive(true); + guidePanel.Event13(); + } public void ResetCombatSkill() { } diff --git a/Blacksmith/MiniTemplate/Datas/BUFF表.xlsx b/Blacksmith/MiniTemplate/Datas/BUFF表.xlsx index dc659ab2..f4fd99f9 100644 Binary files a/Blacksmith/MiniTemplate/Datas/BUFF表.xlsx and b/Blacksmith/MiniTemplate/Datas/BUFF表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/~$关卡表.xlsx b/Blacksmith/MiniTemplate/Datas/~$关卡表.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/Blacksmith/MiniTemplate/Datas/~$关卡表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/~$礼包表.xlsx b/Blacksmith/MiniTemplate/Datas/~$礼包表.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/Blacksmith/MiniTemplate/Datas/~$礼包表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/~$道具表.xlsx b/Blacksmith/MiniTemplate/Datas/~$道具表.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/Blacksmith/MiniTemplate/Datas/~$道具表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/关卡波次表.xlsx b/Blacksmith/MiniTemplate/Datas/关卡波次表.xlsx index d49e9d05..65d8c2f8 100644 Binary files a/Blacksmith/MiniTemplate/Datas/关卡波次表.xlsx and b/Blacksmith/MiniTemplate/Datas/关卡波次表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/关卡表.xlsx b/Blacksmith/MiniTemplate/Datas/关卡表.xlsx index b967bf89..cdc07a5e 100644 Binary files a/Blacksmith/MiniTemplate/Datas/关卡表.xlsx and b/Blacksmith/MiniTemplate/Datas/关卡表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/常量表.xlsx b/Blacksmith/MiniTemplate/Datas/常量表.xlsx index 02dc750a..414ee098 100644 Binary files a/Blacksmith/MiniTemplate/Datas/常量表.xlsx and b/Blacksmith/MiniTemplate/Datas/常量表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/技能体表.xlsx b/Blacksmith/MiniTemplate/Datas/技能体表.xlsx index 6abac845..15fc1f72 100644 Binary files a/Blacksmith/MiniTemplate/Datas/技能体表.xlsx and b/Blacksmith/MiniTemplate/Datas/技能体表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/技能肉鸽表.xlsx b/Blacksmith/MiniTemplate/Datas/技能肉鸽表.xlsx index 1859accd..ef16d5b6 100644 Binary files a/Blacksmith/MiniTemplate/Datas/技能肉鸽表.xlsx and b/Blacksmith/MiniTemplate/Datas/技能肉鸽表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/技能表.xlsx b/Blacksmith/MiniTemplate/Datas/技能表.xlsx index 64ab4a34..8139bcb6 100644 Binary files a/Blacksmith/MiniTemplate/Datas/技能表.xlsx and b/Blacksmith/MiniTemplate/Datas/技能表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/武器属性表.xlsx b/Blacksmith/MiniTemplate/Datas/武器属性表.xlsx index f3fed6dd..a207924a 100644 Binary files a/Blacksmith/MiniTemplate/Datas/武器属性表.xlsx and b/Blacksmith/MiniTemplate/Datas/武器属性表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/武器表.xlsx b/Blacksmith/MiniTemplate/Datas/武器表.xlsx index d8253fb8..e4951246 100644 Binary files a/Blacksmith/MiniTemplate/Datas/武器表.xlsx and b/Blacksmith/MiniTemplate/Datas/武器表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/礼包表.xlsx b/Blacksmith/MiniTemplate/Datas/礼包表.xlsx index 49739cd2..41497a7d 100644 Binary files a/Blacksmith/MiniTemplate/Datas/礼包表.xlsx and b/Blacksmith/MiniTemplate/Datas/礼包表.xlsx differ diff --git a/Blacksmith/MiniTemplate/Datas/道具表.xlsx b/Blacksmith/MiniTemplate/Datas/道具表.xlsx index 2bdd7896..30d67957 100644 Binary files a/Blacksmith/MiniTemplate/Datas/道具表.xlsx and b/Blacksmith/MiniTemplate/Datas/道具表.xlsx differ diff --git a/Blacksmith/Packages/manifest.json b/Blacksmith/Packages/manifest.json index ac2782f3..7e9e3618 100644 --- a/Blacksmith/Packages/manifest.json +++ b/Blacksmith/Packages/manifest.json @@ -3,6 +3,7 @@ "com.code-philosophy.luban": "https://gitee.com/focus-creative-games/luban_unity.git", "com.tuyoogame.yooasset": "2.2.4-preview", "com.unity.collab-proxy": "2.4.4", + "com.unity.device-simulator.devices": "1.0.0", "com.unity.feature.2d": "2.0.1", "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", diff --git a/Blacksmith/Packages/packages-lock.json b/Blacksmith/Packages/packages-lock.json index 77bcd793..eabd0571 100644 --- a/Blacksmith/Packages/packages-lock.json +++ b/Blacksmith/Packages/packages-lock.json @@ -139,6 +139,13 @@ }, "url": "https://packages.unity.cn" }, + "com.unity.device-simulator.devices": { + "version": "1.0.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, diff --git a/Blacksmith/TextToolDatas/slim/backup.txt b/Blacksmith/TextToolDatas/slim/backup.txt index 8907b7e3..477424a4 100644 Binary files a/Blacksmith/TextToolDatas/slim/backup.txt and b/Blacksmith/TextToolDatas/slim/backup.txt differ