备份行李箱微信sdk，备份铁匠战斗逻辑

Blacksmith/Assets/AssetBundleCollectorSetting.asset

@@ -24,27 +24,6 @@ MonoBehaviour:
     AutoCollectShaders: 1
     IgnoreRuleName: NormalIgnoreRule
     Groups:
-    - GroupName: icon
-      GroupDesc: 
-      AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Pack/Npc
-        CollectorGUID: 4b9a0429948603e49a888a8bf862e808
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Pack/Icon
-        CollectorGUID: f201bd1904dfd86439a970e1162dde7d
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
     - GroupName: SpriteAtlas
       GroupDesc: 
       AssetTags: 
@@ -66,3 +45,16 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+    - GroupName: Battle
+      GroupDesc: 
+      AssetTags: 
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/Pack/Prefab
+        CollectorGUID: c062e5290f622f545935e546053b2725
+        CollectorType: 0
+        AddressRuleName: AddressByGroupAndFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 

Blacksmith/Assets/Pack/AtlasIcon.spriteatlasv2.meta

@@ -8,7 +8,7 @@ SpriteAtlasImporter:
     compressionQuality: 50
     maxTextureSize: 2048
     textureCompression: 0
-    filterMode: 1
+    filterMode: 0
     generateMipMaps: 0
     readable: 0
     crunchedCompression: 0
@@ -16,11 +16,11 @@ SpriteAtlasImporter:
   platformSettings: []
   packingSettings:
     serializedVersion: 2
-    padding: 4
+    padding: 8
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
+    enableRotation: 0
-    enableTightPacking: 1
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

Blacksmith/Assets/Pack/Prefab/Mouster.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0068d9fdd6ae5de448870c61b1fb5cd8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Pack/Prefab/Mouster/mouster.prefab

@@ -0,0 +1,233 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &486895527278121529
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6219184157402847857}
+  - component: {fileID: 6239037675563217156}
+  - component: {fileID: 7606110976716731056}
+  - component: {fileID: 1410994484692794917}
+  m_Layer: 0
+  m_Name: "Spine GameObject (\u53F3\u4E0B\u89D2\u94C1\u7827)"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6219184157402847857
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486895527278121529}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5537344553321071934}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6239037675563217156
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486895527278121529}
+  m_Mesh: {fileID: 0}
+--- !u!23 &7606110976716731056
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486895527278121529}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 28a300b957f744948a4ad9f67b77ddd2, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &1410994484692794917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486895527278121529}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: ff3abc44fe256c341b814899bde59357, type: 2}
+  initialSkinName: 
+  fixPrefabOverrideViaMeshFilter: 2
+  initialFlipX: 0
+  initialFlipY: 0
+  updateWhenInvisible: 3
+  separatorSlotNames: []
+  zSpacing: 0
+  useClipping: 1
+  immutableTriangles: 0
+  pmaVertexColors: 1
+  clearStateOnDisable: 0
+  tintBlack: 0
+  singleSubmesh: 0
+  fixDrawOrder: 0
+  addNormals: 0
+  calculateTangents: 0
+  maskInteraction: 0
+  maskMaterials:
+    materialsMaskDisabled: []
+    materialsInsideMask: []
+    materialsOutsideMask: []
+  disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
+  updateTiming: 1
+  unscaledTime: 0
+  _animationName: 
+  loop: 1
+  timeScale: 1
+--- !u!1 &4177370848473932766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5537344553321071934}
+  - component: {fileID: 731921618462809821}
+  - component: {fileID: 1151588281664711620}
+  m_Layer: 0
+  m_Name: mouster
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5537344553321071934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4177370848473932766}
+  serializedVersion: 2
+  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: 6219184157402847857}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &731921618462809821
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4177370848473932766}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 2
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &1151588281664711620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4177370848473932766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9201f5188da6267409bdf485d55967c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lockTra: {fileID: 0}
+  attack: 0
+  hitPoints: 0
+  strength: 0
+  dexterity: 0
+  criticalStrike: 0

Blacksmith/Assets/Pack/Prefab/Mouster/mouster.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6bc73daca7a89a34582f00eaf7bf39ce
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Pack/Prefab/player.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a9b290ae5786bf343a1f5940032ef177
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Pack/Prefab/player/player.prefab

@@ -0,0 +1,99 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5832841353692456753
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7977988578914188099}
+  - component: {fileID: 2859255379752948725}
+  - component: {fileID: 2502596842607686182}
+  m_Layer: 0
+  m_Name: player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7977988578914188099
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5832841353692456753}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2859255379752948725
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5832841353692456753}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3}
+  m_Color: {r: 1, g: 0.08018869, b: 0.08018869, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 2
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &2502596842607686182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5832841353692456753}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 08c739e0deb0ffc468a5e540d85493d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Blacksmith/Assets/Pack/Prefab/player/player.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 68c4f4b7b9e9eeb419816a6c216e8712
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Pack/spine/铁毡/右下角铁砧.png.meta

@@ -43,7 +43,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -119,6 +119,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json

@@ -0,0 +1,464 @@
+[
+  {
+    "ID": 10001,
+    "Bufftype": 1,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302011,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10002,
+    "Bufftype": 2,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302011,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10003,
+    "Bufftype": 3,
+    "Buffprobability": 10000,
+    "Buffeffect1": 4,
+    "Buffparameter1": 1000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302011,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10101,
+    "Bufftype": 4,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302201,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10102,
+    "Bufftype": 5,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302201,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10103,
+    "Bufftype": 6,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302201,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10201,
+    "Bufftype": 7,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302301,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10202,
+    "Bufftype": 8,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302301,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10301,
+    "Bufftype": 9,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302401,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10302,
+    "Bufftype": 10,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302401,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10401,
+    "Bufftype": 11,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302501,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10402,
+    "Bufftype": 12,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302501,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10410,
+    "Bufftype": 13,
+    "Buffprobability": 10000,
+    "Buffeffect1": 9,
+    "Buffparameter1": 1,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302501,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10411,
+    "Bufftype": 13,
+    "Buffprobability": 10000,
+    "Buffeffect1": 9,
+    "Buffparameter1": 2,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302501,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10501,
+    "Bufftype": 13,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302101,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10601,
+    "Bufftype": 14,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 3000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10701,
+    "Bufftype": 15,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 500,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10702,
+    "Bufftype": 15,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 1000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10703,
+    "Bufftype": 15,
+    "Buffprobability": 10000,
+    "Buffeffect1": 1,
+    "Buffparameter1": 2000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10801,
+    "Bufftype": 16,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 500,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10802,
+    "Bufftype": 16,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 1000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10803,
+    "Bufftype": 16,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 2000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10901,
+    "Bufftype": 17,
+    "Buffprobability": 10000,
+    "Buffeffect1": 3,
+    "Buffparameter1": 500,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10902,
+    "Bufftype": 17,
+    "Buffprobability": 10000,
+    "Buffeffect1": 3,
+    "Buffparameter1": 1000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 10903,
+    "Bufftype": 17,
+    "Buffprobability": 10000,
+    "Buffeffect1": 3,
+    "Buffparameter1": 2000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 1,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11001,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 8000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11002,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 16000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11003,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 24000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11004,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 36000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11101,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 8000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11102,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 16000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11103,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 24000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  },
+  {
+    "ID": 11104,
+    "Bufftype": 18,
+    "Buffprobability": 10000,
+    "Buffeffect1": 2,
+    "Buffparameter1": 36000,
+    "Buffeffect2": 0,
+    "Buffparameter2": 0,
+    "Bufftarget": 302601,
+    "BuffSpecial": 0,
+    "Bufftake": 100,
+    "Buffdisappear": 0,
+    "Buffdisappeartime": 0
+  }
+]

Blacksmith/Assets/Resources/Data/blacksmithdata_buff.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 88d9e436cb907e34cbabfddc18618c1e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Resources/Data/blacksmithdata_item.json

@@ -4,9 +4,10 @@
     "Propname": "体力",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 0,
-    "Icon": "",
+    "Icon": "Bow_01",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -17,9 +18,10 @@
     "Propname": "金币",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 0,
-    "Icon": "",
+    "Icon": "Bow_02",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -30,9 +32,10 @@
     "Propname": "木",
     "Propprices": 150,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_03",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -43,9 +46,10 @@
     "Propname": "硬木",
     "Propprices": 600,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_04",
     "Propdescription": 0,
     "Forgingprogress": 10,
     "Forgingprogressda": 2000,
@@ -56,9 +60,10 @@
     "Propname": "木材",
     "Propprices": 2400,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_05",
     "Propdescription": 0,
     "Forgingprogress": 20,
     "Forgingprogressda": 2000,
@@ -69,9 +74,10 @@
     "Propname": "铁",
     "Propprices": 150,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_06",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -82,9 +88,10 @@
     "Propname": "铁块",
     "Propprices": 600,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_07",
     "Propdescription": 0,
     "Forgingprogress": 10,
     "Forgingprogressda": 2000,
@@ -95,9 +102,10 @@
     "Propname": "精铁",
     "Propprices": 2400,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_08",
     "Propdescription": 0,
     "Forgingprogress": 20,
     "Forgingprogressda": 2000,
@@ -108,9 +116,10 @@
     "Propname": "布",
     "Propprices": 150,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_09",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -121,9 +130,10 @@
     "Propname": "布匹",
     "Propprices": 600,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_10",
     "Propdescription": 0,
     "Forgingprogress": 10,
     "Forgingprogressda": 2000,
@@ -134,9 +144,10 @@
     "Propname": "丝绸",
     "Propprices": 2400,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_11",
     "Propdescription": 0,
     "Forgingprogress": 20,
     "Forgingprogressda": 2000,
@@ -147,9 +158,10 @@
     "Propname": "皮",
     "Propprices": 150,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_12",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -160,9 +172,10 @@
     "Propname": "皮革",
     "Propprices": 600,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_13",
     "Propdescription": 0,
     "Forgingprogress": 10,
     "Forgingprogressda": 2000,
@@ -173,9 +186,10 @@
     "Propname": "高级皮革",
     "Propprices": 2400,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_14",
     "Propdescription": 0,
     "Forgingprogress": 20,
     "Forgingprogressda": 2000,
@@ -186,9 +200,10 @@
     "Propname": "银",
     "Propprices": 150,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_15",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -199,9 +214,10 @@
     "Propname": "银块",
     "Propprices": 600,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_16",
     "Propdescription": 0,
     "Forgingprogress": 10,
     "Forgingprogressda": 2000,
@@ -212,9 +228,10 @@
     "Propname": "银锭",
     "Propprices": 2400,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 1,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_17",
     "Propdescription": 0,
     "Forgingprogress": 20,
     "Forgingprogressda": 2000,
@@ -225,9 +242,10 @@
     "Propname": "短剑",
     "Propprices": 300,
     "Itemprice": 600,
+    "Includearms": 302011,
     "Proptype": 3,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_18",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -243,9 +261,10 @@
     "Propname": "铁剑",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302011,
     "Proptype": 3,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_19",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -262,9 +281,10 @@
     "Propname": "骑士剑",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302011,
     "Proptype": 3,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_20",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -278,9 +298,10 @@
     "Propname": "细身剑",
     "Propprices": 4800,
     "Itemprice": 9600,
+    "Includearms": 302011,
     "Proptype": 3,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_21",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -294,9 +315,10 @@
     "Propname": "链甲",
     "Propprices": 1300,
     "Itemprice": 2600,
+    "Includearms": 302101,
     "Proptype": 4,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_22",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -310,9 +332,10 @@
     "Propname": "铁胸甲",
     "Propprices": 900,
     "Itemprice": 1800,
+    "Includearms": 302101,
     "Proptype": 4,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_23",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -327,9 +350,10 @@
     "Propname": "板甲",
     "Propprices": 1600,
     "Itemprice": 3200,
+    "Includearms": 302101,
     "Proptype": 4,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_24",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -344,9 +368,10 @@
     "Propname": "哥特甲",
     "Propprices": 6400,
     "Itemprice": 12800,
+    "Includearms": 302101,
     "Proptype": 4,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_25",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -360,9 +385,10 @@
     "Propname": "铁枪",
     "Propprices": 400,
     "Itemprice": 800,
+    "Includearms": 302201,
     "Proptype": 3,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_26",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -376,9 +402,10 @@
     "Propname": "斧枪",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302201,
     "Proptype": 3,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_27",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -392,9 +419,10 @@
     "Propname": "瑞士戟",
     "Propprices": 2800,
     "Itemprice": 5600,
+    "Includearms": 302201,
     "Proptype": 3,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_28",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -408,9 +436,10 @@
     "Propname": "青铜戟",
     "Propprices": 6400,
     "Itemprice": 12800,
+    "Includearms": 302201,
     "Proptype": 3,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_29",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -424,9 +453,10 @@
     "Propname": "木法杖 ",
     "Propprices": 1800,
     "Itemprice": 3600,
+    "Includearms": 302301,
     "Proptype": 3,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_30",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -440,9 +470,10 @@
     "Propname": "银法杖",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302301,
     "Proptype": 3,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_31",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -456,9 +487,10 @@
     "Propname": "水晶杖",
     "Propprices": 1600,
     "Itemprice": 3200,
+    "Includearms": 302301,
     "Proptype": 3,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_32",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -472,9 +504,10 @@
     "Propname": "祈祷杖",
     "Propprices": 4000,
     "Itemprice": 8000,
+    "Includearms": 302301,
     "Proptype": 3,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_33",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -488,9 +521,10 @@
     "Propname": "木弓",
     "Propprices": 600,
     "Itemprice": 1200,
+    "Includearms": 302401,
     "Proptype": 3,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_34",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -504,9 +538,10 @@
     "Propname": "短弓",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302401,
     "Proptype": 3,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_35",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -520,9 +555,10 @@
     "Propname": "长弓",
     "Propprices": 2800,
     "Itemprice": 5600,
+    "Includearms": 302401,
     "Proptype": 3,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_36",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -536,9 +572,10 @@
     "Propname": "复合弓",
     "Propprices": 5200,
     "Itemprice": 10400,
+    "Includearms": 302401,
     "Proptype": 3,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_37",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -552,9 +589,10 @@
     "Propname": "轻弩",
     "Propprices": 4800,
     "Itemprice": 9600,
+    "Includearms": 302501,
     "Proptype": 3,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_38",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -568,9 +606,10 @@
     "Propname": "重弩",
     "Propprices": 900,
     "Itemprice": 1800,
+    "Includearms": 302501,
     "Proptype": 3,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_39",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -584,9 +623,10 @@
     "Propname": "绞盘弩",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302501,
     "Proptype": 3,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_40",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -600,9 +640,10 @@
     "Propname": "滑车弩",
     "Propprices": 4000,
     "Itemprice": 8000,
+    "Includearms": 302501,
     "Proptype": 3,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_01",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -616,9 +657,10 @@
     "Propname": "粗布衣",
     "Propprices": 2400,
     "Itemprice": 4800,
+    "Includearms": 302601,
     "Proptype": 4,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_02",
     "Propdescription": 0,
     "Forgingprogress": 15,
     "Forgingprogressda": 2000,
@@ -634,9 +676,10 @@
     "Propname": "布甲",
     "Propprices": 1200,
     "Itemprice": 2400,
+    "Includearms": 302601,
     "Proptype": 4,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_03",
     "Propdescription": 0,
     "Forgingprogress": 30,
     "Forgingprogressda": 1500,
@@ -652,9 +695,10 @@
     "Propname": "皮甲",
     "Propprices": 5200,
     "Itemprice": 10400,
+    "Includearms": 302601,
     "Proptype": 4,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_04",
     "Propdescription": 0,
     "Forgingprogress": 45,
     "Forgingprogressda": 1200,
@@ -668,9 +712,10 @@
     "Propname": "重皮甲",
     "Propprices": 6400,
     "Itemprice": 12800,
+    "Includearms": 302601,
     "Proptype": 4,
     "Propquality": 4,
-    "Icon": "",
+    "Icon": "Bow_05",
     "Propdescription": 0,
     "Forgingprogress": 60,
     "Forgingprogressda": 1000,
@@ -684,9 +729,10 @@
     "Propname": "剑类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 1,
-    "Icon": "",
+    "Icon": "Bow_06",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -697,9 +743,10 @@
     "Propname": "重甲类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_07",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -710,9 +757,10 @@
     "Propname": "长柄类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_08",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -723,9 +771,10 @@
     "Propname": "杖类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_09",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -736,9 +785,10 @@
     "Propname": "弓箭类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_10",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -749,9 +799,10 @@
     "Propname": "弩类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 3,
-    "Icon": "",
+    "Icon": "Bow_11",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,
@@ -762,9 +813,10 @@
     "Propname": "轻甲类锻造书",
     "Propprices": 0,
     "Itemprice": 0,
+    "Includearms": 0,
     "Proptype": 0,
     "Propquality": 2,
-    "Icon": "",
+    "Icon": "Bow_12",
     "Propdescription": 0,
     "Forgingprogress": 0,
     "Forgingprogressda": 0,

Blacksmith/Assets/Resources/Data/blacksmithdata_level.json

@@ -0,0 +1,732 @@
+[
+  {
+    "ID": 71001,
+    "Levelicon": "",
+    "Level": 1,
+    "Name": "郊外1",
+    "Levelopen": 0,
+    "Levelwaves": [
+      171101,
+      171102,
+      171103,
+      171104,
+      171105,
+      171106,
+      171107,
+      171108,
+      171109,
+      171110
+    ],
+    "Stagerewards": [
+      3,
+      7,
+      10
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71002,
+    "Levelicon": "",
+    "Level": 2,
+    "Name": "郊外2",
+    "Levelopen": 71001,
+    "Levelwaves": [
+      171201,
+      171202,
+      171203,
+      171204,
+      171205,
+      171206,
+      171207,
+      171208,
+      171209,
+      171210,
+      171211,
+      171212,
+      171213,
+      171214,
+      171215,
+      171216,
+      171217,
+      171218,
+      171219,
+      171220
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71003,
+    "Levelicon": "",
+    "Level": 3,
+    "Name": "郊外3",
+    "Levelopen": 71002,
+    "Levelwaves": [
+      171301,
+      171302,
+      171303,
+      171304,
+      171305,
+      171306,
+      171307,
+      171308,
+      171309,
+      171310,
+      171311,
+      171312,
+      171313,
+      171314,
+      171315,
+      171316,
+      171317,
+      171318,
+      171319,
+      171320
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71004,
+    "Levelicon": "",
+    "Level": 4,
+    "Name": "郊外4",
+    "Levelopen": 71003,
+    "Levelwaves": [
+      171401,
+      171402,
+      171403,
+      171404,
+      171405,
+      171406,
+      171407,
+      171408,
+      171409,
+      171410,
+      171411,
+      171412,
+      171413,
+      171414,
+      171415,
+      171416,
+      171417,
+      171418,
+      171419,
+      171420
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71005,
+    "Levelicon": "",
+    "Level": 5,
+    "Name": "郊外5",
+    "Levelopen": 71004,
+    "Levelwaves": [
+      171501,
+      171502,
+      171503,
+      171504,
+      171505,
+      171506,
+      171507,
+      171508,
+      171509,
+      171510,
+      171511,
+      171512,
+      171513,
+      171514,
+      171515,
+      171516,
+      171517,
+      171518,
+      171519,
+      171520
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71006,
+    "Levelicon": "",
+    "Level": 6,
+    "Name": "郊外6",
+    "Levelopen": 71005,
+    "Levelwaves": [
+      171601,
+      171602,
+      171603,
+      171604,
+      171605,
+      171606,
+      171607,
+      171608,
+      171609,
+      171610,
+      171611,
+      171612,
+      171613,
+      171614,
+      171615,
+      171616,
+      171617,
+      171618,
+      171619,
+      171620
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71007,
+    "Levelicon": "",
+    "Level": 7,
+    "Name": "郊外7",
+    "Levelopen": 71006,
+    "Levelwaves": [
+      171701,
+      171702,
+      171703,
+      171704,
+      171705,
+      171706,
+      171707,
+      171708,
+      171709,
+      171710,
+      171711,
+      171712,
+      171713,
+      171714,
+      171715,
+      171716,
+      171717,
+      171718,
+      171719,
+      171720
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71008,
+    "Levelicon": "",
+    "Level": 8,
+    "Name": "郊外8",
+    "Levelopen": 71007,
+    "Levelwaves": [
+      171801,
+      171802,
+      171803,
+      171804,
+      171805,
+      171806,
+      171807,
+      171808,
+      171809,
+      171810,
+      171811,
+      171812,
+      171813,
+      171814,
+      171815,
+      171816,
+      171817,
+      171818,
+      171819,
+      171820
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71009,
+    "Levelicon": "",
+    "Level": 9,
+    "Name": "郊外9",
+    "Levelopen": 71008,
+    "Levelwaves": [
+      171901,
+      171902,
+      171903,
+      171904,
+      171905,
+      171906,
+      171907,
+      171908,
+      171909,
+      171910,
+      171911,
+      171912,
+      171913,
+      171914,
+      171915,
+      171916,
+      171917,
+      171918,
+      171919,
+      171920
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71010,
+    "Levelicon": "",
+    "Level": 10,
+    "Name": "郊外10",
+    "Levelopen": 71009,
+    "Levelwaves": [
+      172001,
+      172002,
+      172003,
+      172004,
+      172005,
+      172006,
+      172007,
+      172008,
+      172009,
+      172010,
+      172011,
+      172012,
+      172013,
+      172014,
+      172015,
+      172016,
+      172017,
+      172018,
+      172019,
+      172020
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71011,
+    "Levelicon": "",
+    "Level": 11,
+    "Name": "郊外11",
+    "Levelopen": 71010,
+    "Levelwaves": [
+      172101,
+      172102,
+      172103,
+      172104,
+      172105,
+      172106,
+      172107,
+      172108,
+      172109,
+      172110,
+      172111,
+      172112,
+      172113,
+      172114,
+      172115,
+      172116,
+      172117,
+      172118,
+      172119,
+      172120
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71012,
+    "Levelicon": "",
+    "Level": 12,
+    "Name": "郊外12",
+    "Levelopen": 71011,
+    "Levelwaves": [
+      172201,
+      172202,
+      172203,
+      172204,
+      172205,
+      172206,
+      172207,
+      172208,
+      172209,
+      172210,
+      172211,
+      172212,
+      172213,
+      172214,
+      172215,
+      172216,
+      172217,
+      172218,
+      172219,
+      172220
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71013,
+    "Levelicon": "",
+    "Level": 13,
+    "Name": "郊外13",
+    "Levelopen": 71012,
+    "Levelwaves": [
+      172301,
+      172302,
+      172303,
+      172304,
+      172305,
+      172306,
+      172307,
+      172308,
+      172309,
+      172310,
+      172311,
+      172312,
+      172313,
+      172314,
+      172315,
+      172316,
+      172317,
+      172318,
+      172319,
+      172320
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71014,
+    "Levelicon": "",
+    "Level": 14,
+    "Name": "郊外14",
+    "Levelopen": 71013,
+    "Levelwaves": [
+      172401,
+      172402,
+      172403,
+      172404,
+      172405,
+      172406,
+      172407,
+      172408,
+      172409,
+      172410,
+      172411,
+      172412,
+      172413,
+      172414,
+      172415,
+      172416,
+      172417,
+      172418,
+      172419,
+      172420
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71015,
+    "Levelicon": "",
+    "Level": 15,
+    "Name": "郊外15",
+    "Levelopen": 71014,
+    "Levelwaves": [
+      172501,
+      172502,
+      172503,
+      172504,
+      172505,
+      172506,
+      172507,
+      172508,
+      172509,
+      172510,
+      172511,
+      172512,
+      172513,
+      172514,
+      172515,
+      172516,
+      172517,
+      172518,
+      172519,
+      172520
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71016,
+    "Levelicon": "",
+    "Level": 16,
+    "Name": "郊外16",
+    "Levelopen": 71015,
+    "Levelwaves": [
+      172601,
+      172602,
+      172603,
+      172604,
+      172605,
+      172606,
+      172607,
+      172608,
+      172609,
+      172610,
+      172611,
+      172612,
+      172613,
+      172614,
+      172615,
+      172616,
+      172617,
+      172618,
+      172619,
+      172620
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71017,
+    "Levelicon": "",
+    "Level": 17,
+    "Name": "郊外17",
+    "Levelopen": 71016,
+    "Levelwaves": [
+      172701,
+      172702,
+      172703,
+      172704,
+      172705,
+      172706,
+      172707,
+      172708,
+      172709,
+      172710,
+      172711,
+      172712,
+      172713,
+      172714,
+      172715,
+      172716,
+      172717,
+      172718,
+      172719,
+      172720
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71018,
+    "Levelicon": "",
+    "Level": 18,
+    "Name": "郊外18",
+    "Levelopen": 71017,
+    "Levelwaves": [
+      172801,
+      172802,
+      172803,
+      172804,
+      172805,
+      172806,
+      172807,
+      172808,
+      172809,
+      172810,
+      172811,
+      172812,
+      172813,
+      172814,
+      172815,
+      172816,
+      172817,
+      172818,
+      172819,
+      172820
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71019,
+    "Levelicon": "",
+    "Level": 19,
+    "Name": "郊外19",
+    "Levelopen": 71018,
+    "Levelwaves": [
+      172901,
+      172902,
+      172903,
+      172904,
+      172905,
+      172906,
+      172907,
+      172908,
+      172909,
+      172910,
+      172911,
+      172912,
+      172913,
+      172914,
+      172915,
+      172916,
+      172917,
+      172918,
+      172919,
+      172920
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  },
+  {
+    "ID": 71020,
+    "Levelicon": "",
+    "Level": 20,
+    "Name": "郊外20",
+    "Levelopen": 71019,
+    "Levelwaves": [
+      173001,
+      173002,
+      173003,
+      173004,
+      173005,
+      173006,
+      173007,
+      173008,
+      173009,
+      173010,
+      173011,
+      173012,
+      173013,
+      173014,
+      173015,
+      173016,
+      173017,
+      173018,
+      173019,
+      173020
+    ],
+    "Stagerewards": [
+      5,
+      12,
+      20
+    ],
+    "Gift": 0,
+    "Physicalexertion": 5,
+    "Music": ""
+  }
+]

Blacksmith/Assets/Resources/Data/blacksmithdata_level.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a603aa7381379c2428759d6091dfe242
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Resources/Data/blacksmithdata_levelwave.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 615d9ae33b2f5e949821339cb4046d23
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Blacksmith/Assets/Resources/Data/blacksmithdata_main.json

@@ -100,17 +100,5 @@
     "ConstantValue": "120",
     "ConstantString": "",
     "Commant": "开店整体时间（秒）"
-  },
-  {
-    "ID": 18,
-    "ConstantValue": "1012,2011",
-    "ConstantString": "",
-    "Commant": "默认解锁id"
-  },
-  {
-    "ID": 19,
-    "ConstantValue": "1,1000",
-    "ConstantString": "",
-    "Commant": "添加默认道具"
   }
 ]

Blacksmith/Assets/Resources/Data/blacksmithdata_mouster.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c8ba76e9c3fa4ac4d8bd436864efd2c3
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: