add

Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
add
2024-11-05 01:59:52 +08:00 · 2024-11-04 23:22:05 +08:00 · 2024-11-04 23:21:48 +08:00
8 changed files with 468 additions and 564 deletions
--- a/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity
+++ b/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity
@ -767,7 +767,6 @@ Transform:
  - {fileID: 1621691473}
  - {fileID: 723548395}
  - {fileID: 998933732}
-  - {fileID: 232661052}
  - {fileID: 1394028151}
  - {fileID: 754841770}
  m_Father: {fileID: 787643888}
@ -1323,112 +1322,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!1 &232661051
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 232661052}
-  - component: {fileID: 232661054}
-  - component: {fileID: 232661055}
-  m_Layer: 0
-  m_Name: island_3_2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!4 &232661052
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 232661051}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -6.91, y: 0.08, z: 0.4}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 56346249}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &232661054
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 232661051}
-  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: 21300000, guid: 582f4306732040544a18d819295c15d1, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 7.7, y: 6.47}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!95 &232661055
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 232661051}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 1161d37800935df4c9a787106c9467d0, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &296360678
 GameObject:
  m_ObjectHideFlags: 0
@ -1635,11 +1528,6 @@ Transform:
  m_Father: {fileID: 1343167264}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &307640257 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-  m_PrefabInstance: {fileID: 7825153275260973373}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &310426478
 GameObject:
  m_ObjectHideFlags: 0
@ -3116,7 +3004,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 56346249}
-  m_RootOrder: 7
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &754841771
 SpriteRenderer:
@ -3755,11 +3643,6 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 4284489241738703987, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
  m_PrefabInstance: {fileID: 794613307}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &813303681 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-  m_PrefabInstance: {fileID: 6925555825891069699}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &814245188
 GameObject:
  m_ObjectHideFlags: 0
@ -4504,11 +4387,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!4 &1033325031 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-  m_PrefabInstance: {fileID: 3484015117250117178}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1048058357
 GameObject:
  m_ObjectHideFlags: 0
@ -4706,11 +4584,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!4 &1074259787 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-  m_PrefabInstance: {fileID: 6957142252390089033}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1113669196
 GameObject:
  m_ObjectHideFlags: 0
@ -5597,7 +5470,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 56346249}
-  m_RootOrder: 6
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1394028152
 Animator:
@ -6592,7 +6465,6 @@ Transform:
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1633375880}
-  - {fileID: 307640257}
  m_Father: {fileID: 1987825451}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8724,9 +8596,6 @@ Transform:
  m_Children:
  - {fileID: 1597418305}
  - {fileID: 787643888}
-  - {fileID: 813303681}
-  - {fileID: 1033325031}
-  - {fileID: 1074259787}
  m_Father: {fileID: 0}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8999,247 +8868,3 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!1001 &3484015117250117178
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1987825451}
-    m_Modifications:
-    - target: {fileID: 3484015116219840476, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_Name
-      value: yunduo2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840476, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -11.73
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 7.38
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.044981327
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3484015116219840477, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: fc233b06599a9514da8f9a0afe271bec, type: 3}
--- !u!1001 &6925555825891069699
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1987825451}
-    m_Modifications:
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -12.82
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 7.49
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702402, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702403, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_Name
-      value: yunduo1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6925555826155702403, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 326ad9e2ed4edba4a9ba6ed0a92a35d3, type: 3}
--- !u!1001 &6957142252390089033
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1987825451}
-    m_Modifications:
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -13.35
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.044981327
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020482, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020483, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_Name
-      value: yunduo3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6957142253464020483, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0e7c422872a495143ad87ec460d00a2c, type: 3}
--- !u!1001 &7825153275260973373
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1597418305}
-    m_Modifications:
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.37
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 3.14
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937788, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937789, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_Name
-      value: fish_1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7825153275559937789, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 65b1f95d801f0ab4d80346661b2fa285, type: 3}
--- a/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity
+++ b/meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity
@ -1005,10 +1005,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a48788a64136b294b8e996807b88dad1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  icon:
+  iconS:
  - {fileID: 21300000, guid: 9aaf93beba8dd1a4797b67dee38c97e4, type: 3}
  - {fileID: 21300000, guid: b87eb5ed7d0f2864d9223218fadf02ef, type: 3}
  - {fileID: 21300000, guid: 38e6b85e401c08f4eb5938aa19e72515, type: 3}
+  number: 1
+  max: 10
+  minerjiage: 0
+  type: 0
 --- !u!1 &199805571
 GameObject:
  m_ObjectHideFlags: 0
@ -2508,7 +2512,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  fishManPrefab: {fileID: 8759413356347716201, guid: 895559f95d4ca3b47a49156ec979e40c, type: 3}
  listItem:
-  - Id: 8a261c1b-dfb9-44c1-be02-652863a40691
+  - Id: 740fd1cb-5c5a-4a5b-be6c-ba6c2da0888f
    Num: 1
    Type: 0
    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
@ -2518,8 +2522,8 @@ MonoBehaviour:
    AlreadyGenerateValue: 0
    RemainEndureTime: 0
    EndureTime: 0
-    CreateDateTime: 2024-11-03T15:57:20.700894Z
-  - Id: 73dea487-7ac6-4077-b4b6-3457f24c90ad
+    CreateDateTime: 2024-11-03T21:36:38.74878Z
+  - Id: 6d74f0ea-6caa-47c6-af2e-72f29e390d4f
    Num: 1
    Type: 0
    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
@ -2529,7 +2533,40 @@ MonoBehaviour:
    AlreadyGenerateValue: 0
    RemainEndureTime: 0
    EndureTime: 0
-    CreateDateTime: 2024-11-03T15:46:19.214118Z
+    CreateDateTime: 2024-11-04T12:45:00.720253Z
+  - Id: c6c2f49a-702e-4df7-86ef-eb3703745de4
+    Num: 1
+    Type: 0
+    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    GeneratorId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    ActivateValue: 0
+    GenerateValue: 0
+    AlreadyGenerateValue: 0
+    RemainEndureTime: 0
+    EndureTime: 0
+    CreateDateTime: 2024-11-04T14:52:47.107164Z
+  - Id: e403f404-baea-4326-9d5e-35e7dd5eac61
+    Num: 1
+    Type: 0
+    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    GeneratorId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    ActivateValue: 0
+    GenerateValue: 0
+    AlreadyGenerateValue: 0
+    RemainEndureTime: 0
+    EndureTime: 0
+    CreateDateTime: 2024-11-04T14:55:16.44787Z
+  - Id: 32d128e5-e50b-4dfb-b72c-fe07adae0402
+    Num: 1
+    Type: 0
+    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    GeneratorId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
+    ActivateValue: 0
+    GenerateValue: 0
+    AlreadyGenerateValue: 0
+    RemainEndureTime: 0
+    EndureTime: 0
+    CreateDateTime: 2024-11-04T14:55:26.993736Z
  startPos: {fileID: 1734571546}
  endPos: {fileID: 736711439}
  type: 0
@ -4192,7 +4229,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  fishManPrefab: {fileID: 9027535534103199909, guid: 930941387799a9d479889a373bafdc8e, type: 3}
  listItem:
-  - Id: 571030cd-a534-4e86-9db5-95e91086d8ff
+  - Id: e7ea4b57-b461-4ef1-b24f-912240993d13
    Num: 4
    Type: 0
    OwnerId: 3dbdc6f5-62da-42e6-9819-73f52ca4fd6b
@ -4202,7 +4239,7 @@ MonoBehaviour:
    AlreadyGenerateValue: 0
    RemainEndureTime: 0
    EndureTime: 0
-    CreateDateTime: 2024-11-03T15:46:26.728038Z
+    CreateDateTime: 2024-11-03T21:36:39.699507Z
  startPos: {fileID: 1067588907}
  endPos: {fileID: 1392929798}
  type: 1
@ -5873,7 +5910,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: "\u5269\u4F59\uFF1A2"
+  m_text: "\u5269\u4F59\uFF1A5"
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2}
  m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2}
--- a/meng_yao/Assets/communal/mount.cs
+++ b/meng_yao/Assets/communal/mount.cs
@ -44,6 +44,31 @@ public class Item//
    public List<float> ReferrerBouns;
    public string CreateDateTime;
 }
+
+[Serializable]
+public class BuyuItem//捕鱼精灵数据item
+{
+    public int Id;
+    public int Num;
+    public int Type;
+    public string Name;
+    public float ActivateValue;
+    public float GenerateValue;
+    public float GainOdds;
+    public int EndureTime;
+    public List<float> ReferrerBouns;
+    public string CreateDateTime;
+}
+
+
+[Serializable]
+public class BuyuList
+{
+
+    public BuyuItem[] List;
+}
+
+
 [Serializable]
 public class VoucherItem//返回的代金卷数据
 {
@ -60,6 +85,8 @@ public class VoucherItem//
    public string CreateDateTime;
 }

+
+
 /*[Serializable]
 public class JinshaItem//返回的精灵数据
 {
@ -116,6 +143,30 @@ public class AllVocherItem //
    public string UsedDateTime;
    public string CreateDateTime;
 }
+
+
+[Serializable]
+
+public class AllGemVocItem //获取宝石矿所有代金卷数据
+{
+    public string Id;
+    public float Num;
+    public float Type;
+    public string OwnerId;
+    public float StoreValue;
+    public float AlreadyGenerateValue;
+    public float GenerateValue;
+    public float RemainEndureTime;
+    public float EndureTime;
+    public string CreateDateTime;
+}
+
+public class AllGemVocItemRes : Res //获取宝石矿的类
+{
+    public AllGemVocItem[] List;
+}
+
+
 [Serializable]
 public class Res//消息返回类
 {
--- a/meng_yao/Assets/script/Panel/AssestPanel.cs
+++ b/meng_yao/Assets/script/Panel/AssestPanel.cs
@ -27,9 +27,11 @@ public class AssestPanel : MonoBehaviour

    public async void loding()
    {
-        Login login = new Login();
-        login.Phone = "1";
-        await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
+        //Login login = new Login();
+        //login.Phone = "1";
+        //await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
+
+     

    }

--- a/meng_yao/Assets/script/cultivation_Jinsha_mine_slices/room.cs
+++ b/meng_yao/Assets/script/cultivation_Jinsha_mine_slices/room.cs
@ -43,13 +43,15 @@ public class room : mount
        if (toolsNumber_text==null)
        {
            toolsNumber = 10;
-            haveNumber = 10;
+            haveNumber = 0;
        }
-
+       
        ChangeTextPro();
      
+
+
          loding();
-    //    Allminer();
+   

     

@ -60,7 +62,7 @@ public class room : mount
        if (toolsNumber_text == null) return;
           
        jinsha.intance.OnType += addman;
-        jinsha.intance.OnType += addtools;
+   


    }
@ -70,8 +72,7 @@ public class room : mount
        if (toolsNumber_text == null) return;

        jinsha.intance.OnType -= addman;
-        jinsha.intance.OnType -= addtools;
-
+     
    }
   

@ -86,7 +87,7 @@ public class room : mount
        if (toolsNumber_text == null)
        {
            GetRoom();
-            PlayerManager.Instance.SetMoney(MoneyType.Stones, -10);
+       
        }

      
@ -109,13 +110,13 @@ public class room : mount

    private async void OnMouseDown()
    {
-        if (haveNumber<1||toolsNumber<1)
+       /* if (haveNumber<1||toolsNumber<1)
        {
            Promptmgr.Instance.PromptBubble("人数或工具不足", Color.black, Color.red);
            return;            
-        }
+        }*/

-        if (toolsNumber_text == null)
+        /*if (toolsNumber_text == null)
        {
            Debug.Log("扣钱检测");
            if (PlayerManager.Instance.GetNumer(MoneyType.Stones) < 11)
@ -123,11 +124,11 @@ public class room : mount
                Promptmgr.Instance.PromptBubble("购买卷不足", Color.black, Color.red);
                return;
            }
-            PlayerManager.Instance.SetMoney(MoneyType.Stones, -10);
-        }
-
+       
+        }*/
+        Generate(1);
        GetRoom();
-        haveNumber--;
+        haveNumber++;
        toolsNumber--;
        UpdateShowCazhi();
         ChangeTextPro();
@ -173,7 +174,7 @@ public class room : mount
                Promptmgr.Instance.PromptBubble("购买卷不足", Color.black, Color.red);
                return;
            }
-            PlayerManager.Instance.SetMoney(MoneyType.Coins, -10);
+       


            if ((startPos.childCount + haveNumber) > 9)
@ -196,171 +197,133 @@ public class room : mount
       
    }

-    void addtools(int type, int num)
-    {
-        if (type == this.type+1)
-        {

-            Debug.Log("扣钱检测");
-            if (PlayerManager.Instance.GetNumer(MoneyType.Coins) < 11)
-            {
-                Promptmgr.Instance.PromptBubble("购买卷不足", Color.black, Color.red);
-                return;
-            }
-            PlayerManager.Instance.SetMoney(MoneyType.Coins, -10);
-            
-
-            if ((startPos.childCount + toolsNumber) > 9)
-            {
-                Promptmgr.Instance.PromptBubble("矿洞已满", Color.black, Color.red);
-                return;
-            }
-
-            if (toolsNumber > 9)
-            {
-                Promptmgr.Instance.PromptBubble("工具已满", Color.black, Color.red);
-                return;
-            }
-
-            
-
-            toolsNumber += 1;
-            Promptmgr.Instance.PromptBubble("购买成功");
-            UpdateShowCazhi();
-            ChangeTextPro();
-
-            GetRoom();
-        }
-    }

    private async void loding()
    {
+        Login login = new Login();
+        login.Phone = "1";
+        await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
+
+
+        string sponse = await web.SendRequest(web.URL + "/MinerElf/GetList", "POST");
+        Debug.Log(sponse);
+
+
        string response = await web.SendRequest(web.URL + "/MinerElfActive/GetListOfGem", "POST");
-        Debug.Log(response);
-        AllVocherItemRes itemList = JsonUtility.FromJson<AllVocherItemRes>(response);
+        //Debug.Log(response);
+        AllGemVocItemRes itemList = JsonUtility.FromJson<AllGemVocItemRes>(response);
        for (int i = 0; i < itemList.List.Length; i++)
        {
            if (itemList.List[i].Num == buy_type)
            {
                haveNumber += 1;
+                Debug.Log(this.gameObject.name+"矿工数量" + haveNumber);
            }
        }
+        ChangeTextPro();      
       
-
-    }
-
-
-
-    private async void Generate(int count)
-    {
-
-        GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买矿工
-        generateForFisherElf.Num = buy_type;
-        generateForFisherElf.Count = count;
-        string response = await web.SendRequest(web.URL + "/Voucher/GenerateForMinerElf", "POST", JsonUtility.ToJson(generateForFisherElf));
-      
-        Mining_Wizard_ID data = JsonUtility.FromJson<Mining_Wizard_ID>(response);
-     
-        Use use = new Use();
-         use.Id = data.Ids[0];
-     
-        if (use.Id != null)
+        for (int i = 0; i < haveNumber; i++)
        {
-            Buy_succefful = true;
+            GetRoom();
+            GameObject newMiner = GameObject.Instantiate(minerPrefab);
+            newMiner.transform.SetParent(startPos);
+            newMiner.transform.position = gold.position;
+
        }
-        string jsonString = JsonUtility.ToJson(use);
-        string aa =await web.SendRequest(web.URL + "/Voucher/Use", "POST", jsonString);
-        Debug.Log(aa);
+
    }


-
-
-    private async void Allminer()
-    {
-
-        string response = await web.SendRequest(web.URL + "/MinerElf/GetList", "POST");
-
-        Debug.Log(response);
-        Response reslist = JsonUtility.FromJson<Response>(response);
-
-        for (int i = 0; i < reslist.List.Length; i++)
+        private async void Generate(int count)
        {
-            if (reslist.List[i].Type == 1)
+
+            GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买矿工
+            generateForFisherElf.Num = buy_type;
+            generateForFisherElf.Count = count;
+            string response = await web.SendRequest(web.URL + "/Voucher/GenerateForMinerElf", "POST", JsonUtility.ToJson(generateForFisherElf));
+           
+            Mining_Wizard_ID data = JsonUtility.FromJson<Mining_Wizard_ID>(response);
+            
+            Use use = new Use();
+            use.Id = data.Ids[0];
+            string jsonString = JsonUtility.ToJson(use);
+            Debug.Log(jsonString);
+            string aa = await web.SendRequest(web.URL + "/Voucher/Use", "POST", jsonString);
+            Debug.Log(aa);
+        }
+
+
+
+
+
+
+
+
+        //开拓房间
+        void GetRoom()
+        {
+            if (this.BlackRoom == null) return;
+            Destroy(this.BlackRoom);
+        }
+
+        void UpdateShowCazhi()
+        {
+            if (toolsNumber_text == null)
            {
-                itemlist.Add(reslist.List[i]);
+                return;
+            }
+            switch (toolsNumber)
+            {
+                case 0:
+                    cazhi[0].SetActive(false);
+                    cazhi[1].SetActive(false);
+                    cazhi[2].SetActive(false);
+                    cazhi[3].SetActive(false);
+                    cazhi[4].SetActive(false);
+                    break;
+                case 1:
+                    cazhi[0].SetActive(true);
+                    cazhi[1].SetActive(false);
+                    cazhi[2].SetActive(false);
+                    cazhi[3].SetActive(false);
+                    cazhi[4].SetActive(false);
+                    break;
+                case 2:
+                    cazhi[0].SetActive(true);
+                    cazhi[1].SetActive(true);
+                    cazhi[2].SetActive(false);
+                    cazhi[3].SetActive(false);
+                    cazhi[4].SetActive(false);
+                    break;
+                case 3:
+                    cazhi[0].SetActive(true);
+                    cazhi[1].SetActive(true);
+                    cazhi[2].SetActive(true);
+                    cazhi[3].SetActive(false);
+                    cazhi[4].SetActive(false);
+                    break;
+                case 4:
+                    cazhi[0].SetActive(true);
+                    cazhi[1].SetActive(true);
+                    cazhi[2].SetActive(true);
+                    cazhi[3].SetActive(true);
+                    cazhi[4].SetActive(false);
+                    break;
+                case 5:
+                    cazhi[0].SetActive(true);
+                    cazhi[1].SetActive(true);
+                    cazhi[2].SetActive(true);
+                    cazhi[3].SetActive(true);
+                    cazhi[4].SetActive(true);
+                    break;
            }
        }


-    }
+ }



-    //开拓房间
-    void GetRoom()
-    {
-        if (BlackRoom == null) return;
-        Destroy(BlackRoom) ;
-    }
-
-    void UpdateShowCazhi()
-    {
-        if (toolsNumber_text == null)
-        {
-            return;
-        }
-        switch (toolsNumber)
-        {
-            case 0:
-                cazhi[0].SetActive(false);
-                cazhi[1].SetActive(false);
-                cazhi[2].SetActive(false);
-                cazhi[3].SetActive(false);
-                cazhi[4].SetActive(false);
-                break;
-            case 1:
-                cazhi[0].SetActive(true);
-                cazhi[1].SetActive(false);
-                cazhi[2].SetActive(false);
-                cazhi[3].SetActive(false);
-                cazhi[4].SetActive(false);
-                break;
-            case 2:
-                cazhi[0].SetActive(true);
-                cazhi[1].SetActive(true);
-                cazhi[2].SetActive(false);
-                cazhi[3].SetActive(false);
-                cazhi[4].SetActive(false);
-                break;
-            case 3:
-                cazhi[0].SetActive(true);
-                cazhi[1].SetActive(true);
-                cazhi[2].SetActive(true);
-                cazhi[3].SetActive(false);
-                cazhi[4].SetActive(false);
-                break;
-            case 4:
-                cazhi[0].SetActive(true);
-                cazhi[1].SetActive(true);
-                cazhi[2].SetActive(true);
-                cazhi[3].SetActive(true);
-                cazhi[4].SetActive(false);
-                break;
-            case 5:
-                cazhi[0].SetActive(true);
-                cazhi[1].SetActive(true);
-                cazhi[2].SetActive(true);
-                cazhi[3].SetActive(true);
-                cazhi[4].SetActive(true);
-                break;        
-        }
-    }
-
-
-    
-
-}
-


--- a/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs
+++ b/meng_yao/Assets/script/cultivation_gold_coin_Island/boy.cs
@ -16,13 +16,13 @@ public class boy : mount
    }
    private async void Start()
    {
-        //测试用
-        /*Login login = new Login();
+        //  测试用
+        Login login = new Login();
        login.Phone = "111";
-        await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));*/
+        await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
+


-        
        UpShipTimer();
    }

--- a/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs
+++ b/meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs
@ -103,6 +103,7 @@ public class landContorl : MonoBehaviour

    private void OnMouseDown()
    {
+        Debug.Log("点击岛屿");
        if (fishMan != null)
        {
            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
--- a/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs
+++ b/meng_yao/Assets/script/cultivation_gold_gold_Island/shopman.cs
@ -1,6 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
+using System;
+using System.Threading.Tasks;

 public class shopman :mount
 {
@ -8,34 +11,54 @@ public class shopman :mount
    public delegate void OnClikeWT(int type, int num);
    public event OnClikeWT OnType;//点击事件

-    public List<Sprite> icon;
+   
+    public List<Sprite> iconS;
+
+
+    public int number = 1;
+    public int max = 10;
+    public int minerjiage = 0;
+
+    public int type =0;
    // Start is called before the first frame update
    public override void Awake()
    {
        instance = this;
    }

-    public void buy_ship()
+    public async void  buy_ship()
    {
-       
+
+
+        //Login login = new Login();
+        //login.Phone = "1";
+        //await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
        //关闭摄像头逻辑
        Cinemachine_2dCon.SetCameraContorl(false);
        //Debug.LogError("禁用生成船只逻辑");
        landContorl_jinsha.canClick = false;

+        string userponse = await web.SendRequest(web.URL + "/FisherElf/GetList", "POST");
+        Debug.Log(userponse);
+        BuyuList itemList = JsonUtility.FromJson<BuyuList>(userponse);
+        Debug.Log(itemList.List[0].Type);
+
+
        List<BoxType> boxTypes = new List<BoxType>();
+        int index = 1;
+        List<GameObject> list_by = new List<GameObject>();//捕鱼精灵
+        foreach (BuyuItem item in itemList.List)
+        {
+            //Debug.Log(Struct.StructToString(item,1));
+            if (type == item.Type && item.Num == 1 || type == item.Type && item.Num == 4 || type == item.Type && item.Num == 7)
+            {
+                boxTypes.Add(new BoxType { Name = index.ToString() + "文本", prompt = "第" + ArabicToChineseNumberConverter.ConvertToChineseNumbers(index.ToString()) + "层", Type = 4, is_required = true });
+                boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = item.Name, Type = 3, icon =iconS[index -1],customData = new BoxData<BuyuItem>(item) });
+                index++;
+            }

-        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第一层", Type = 4, is_required = true });
-        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "初级精灵", Type = 3, is_required = true, icon = icon[0] });      
+        }

-        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第二层", Type = 4, is_required = true });
-        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "中级精灵", Type = 3, is_required = true, icon = icon[1] });     
-
-        boxTypes.Add(new BoxType { Name = "矿工1文本", prompt = "第三层", Type = 4, is_required = true });
-        boxTypes.Add(new BoxType { Name = "矿工1", prompt = "高级精灵", Type = 3, is_required = true, icon = icon[2] });        
-
-
-      
        //boxTypes[3] = new BoxType { Name = "submit", textName = " 取消确定 ", Type = 2 };
        GameObject gameObject = add_pop_up();
        gameObject.GetComponent<input_box_pop_up_window>().minHeight = 800;//设置最低高度
@ -54,22 +77,224 @@ public class shopman :mount
        {
            if (type == 1)
            {
-                OnType?.Invoke(0, 1);              
+                Debug.Log("点击购买按钮");
+                if (boxType.customData is BoxData<BuyuItem> intData)//通过储存的泛型来查找挖矿精灵对应的item数据
+                {
+                    Debug.Log("进入创建弹窗");
+                    BuyuItem item = intData.GetTypedData();
+                    Show_buy(boxType.icon, boxType.prompt, 64, item.Num, item.ActivateValue);
+
+                }
+            }
+            else
+            {
+                //创建搜索用户的弹窗
+                List<BoxType> boxTypes = new List<BoxType>();
+                boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号", Type = 8, is_required = true });
+                GameObject gameObject = add_pop_up(true);//生成弹窗母体
+                gameObject.GetComponent<input_box_pop_up_window>().minHeight = 150;
+                gameObject.GetComponent<input_box_pop_up_window>().setScrollMode(0);
+                gameObject.GetComponent<input_box_pop_up_window>().is_force = false;
+                List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "赠送好友");//回调处理
+                List<GameObject> gameObjectitems = new List<GameObject>();
+                gameObjects[0].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
+                {
+                    foreach (GameObject item in gameObjectitems)
+                    {
+                        gameObject.GetComponent<input_box_pop_up_window>().Remove(item);
+                    }
+                    gameObject.GetComponent<input_box_pop_up_window>().minHeight = 900;
+                    gameObject.GetComponent<input_box_pop_up_window>().setScrollMode(1);
+                    //通过web查询到搜索的玩家
+                    GetListByPhone getlistbyphone = new GetListByPhone();
+                    getlistbyphone.Phone = "1";
+                    string userponse = await web.SendRequest(web.URL+ "/Player/GetListByPhone", "POST", JsonUtility.ToJson(getlistbyphone));
+                    RootData itemList = JsonUtility.FromJson<RootData>(userponse);
+
+                    List<BoxType> boxTypes = new List<BoxType>();//搜索到的用户添加到弹窗
+                    for (int i = 0; i < itemList.List.Length; i++)
+                    {
+                        boxTypes.Add(new BoxType { textName = "查找到的玩家", content = "lv." + itemList.List[i].Level.ToString(), prompt = itemList.List[i].Name, Type = 7, customData = new BoxData<PlayerData>(itemList.List[i]) });
+                    }
+
+                    gameObjectitems = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "赠送好友");
+                    //为了解决无法居中的问题,建议平时别用
+                    gameObject.GetComponent<input_box_pop_up_window>().viewport.GetComponent<VerticalLayoutGroup>().enabled = true;
+                    await Task.Delay(1000);
+                    gameObject.GetComponent<input_box_pop_up_window>().viewport.GetComponent<VerticalLayoutGroup>().enabled = false;
+                    //收束
+                    foreach (GameObject item in gameObjectitems)
+                    {
+                        item.GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) => {
+                            Debug.Log(boxType.customData);
+                            if (boxType.customData is BoxData<PlayerData> intData)//通过储存的泛型来查找挖矿精灵对应的item数据
+                            {
+
+                                PlayerData pldata = intData.GetTypedData();
+                            }
+
+                            List<BoxType> boxTypeser = new List<BoxType>();
+                            boxTypeser.Add(new BoxType { Name = "account_number", textName = "二次确定", content = "1.请确认赠送的玩家身份\r\n2.免责声明:\r\n赠送及视为您已同意将该道具赠送于玩家,点击确认按钮后无法取消和撤回.\r\n3.请谨慎操作", Type = 9, is_required = true });
+                            boxTypeser.Add(new BoxType { Name = "account_number", textName = "确认取消按钮", Type = 2, is_required = true });
+                            GameObject ercitanchuang = add_pop_up(true);//生成弹窗母体
+                            ercitanchuang.GetComponent<input_box_pop_up_window>().is_force = false;
+                            List<GameObject> ercitanchuangs = ercitanchuang.GetComponent<input_box_pop_up_window>().updateUI(boxTypeser, "警告");
+                            ercitanchuangs[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>
+                            {
+                                if (type == 1)
+                                {
+
+                                    //赠送逻辑
+                                    ercitanchuang.GetComponent<input_box_pop_up_window>().destroy();
+                                }
+                                else
+                                {
+                                    ercitanchuang.GetComponent<input_box_pop_up_window>().destroy();
+                                }
+                            });
+
+                        });
+                    }
+                });
            }
        });
        gameObjects[3].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
        {
-            if (type == 1)
+            Debug.Log("点击购买按钮");
+            if (boxType.customData is BoxData<BuyuItem> intData)//通过储存的泛型来查找挖矿精灵对应的item数据
            {
-                OnType?.Invoke(1, 1);              
+                Debug.Log("进入创建弹窗");
+                BuyuItem item = intData.GetTypedData();
+                Show_buy(boxType.icon, boxType.prompt, 64, item.Num, item.ActivateValue);
+
            }
        });
        gameObjects[5].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
        {
-            if (type == 1)
+            Debug.Log("点击购买按钮");
+            if (boxType.customData is BoxData<BuyuItem> intData)//通过储存的泛型来查找挖矿精灵对应的item数据
            {
-                OnType?.Invoke(2, 1);             
+                Debug.Log("进入创建弹窗");
+                BuyuItem item = intData.GetTypedData();
+                Show_buy(boxType.icon, boxType.prompt, 64, item.Num, item.ActivateValue);
+
            }
        });
    }
+
+
+    public void Show_buy(Sprite minerIcon, string minerName, int CurrencyId, int Num, float minerjiage, bool isMinr = true)//购买弹窗
+    {
+
+        if (float.Parse(AssestPanel.instance.Coin.text) < minerjiage)
+        {
+            Promptmgr.Instance.PromptBubble("金币不够！！！", Color.black, Color.red);
+            return;
+        }
+
+
+        List<BoxType> boxTypes = new List<BoxType>();
+
+        boxTypes.Add(new BoxType
+        {
+            Name = "account_number",
+            textName = "道具兑换道具",
+            Type = 10,
+            is_required = false,
+            icon = LoadSprite(mount.mountitem.itemDataList[CurrencyId].IconPath),
+            icon2 = minerIcon,
+            nametext1 = "金币",
+            nametext2 = minerName,
+            numbertext1 = "1",//单个矿工的价钱
+            numbertext2 = number.ToString()//几个矿工
+        });
+
+        boxTypes.Add(new BoxType { Name = "account_number", textName = " 数量:", prompt = "请输入购买数量", Type = 6, is_required = false });
+        boxTypes.Add(new BoxType { Name = "submit", textName = " 取消购买 ", Type = 2 });
+        GameObject gameObject = add_pop_up(true);//生成弹窗母体
+        gameObject.GetComponent<input_box_pop_up_window>().minHeight = 800;//设置最低高度
+        List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "购买");//测试输入框回调处理
+
+        //初始化
+        number = 1;
+        this.minerjiage = (int)minerjiage;
+        max = (int)(float.Parse(AssestPanel.instance.Coin.text) / minerjiage);
+        //max = int.Parse(AssestPanel.instance.Coin.text) / this.minerjiage;
+
+        gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj1.GetComponent<Text>().text = (this.minerjiage * number).ToString();
+        gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj2.GetComponent<Text>().text = number.ToString();
+
+        UpdateText(gameObjects[1].GetComponent<input_box_pop_up_window_item>().contentobj.GetComponent<Text>());
+        UpdateText(gameObjects[1].GetComponent<input_box_pop_up_window_item>().contentobj.GetComponent<Text>());
+
+        gameObjects[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
+        {
+            if (type == 0)
+            {
+                if (number > 1)
+                {
+                    number--;
+                    max = (int)(float.Parse(AssestPanel.instance.Coin.text) / minerjiage);
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj1.GetComponent<Text>().text = (this.minerjiage * number).ToString();
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj2.GetComponent<Text>().text = number.ToString();
+                    UpdateText(gameObjects[1].GetComponent<input_box_pop_up_window_item>().contentobj.GetComponent<Text>());
+                }
+            }
+            else if (type == 1)
+            {
+                if (number < max)
+                {
+                    number++;
+                    max = (int)(float.Parse(AssestPanel.instance.Coin.text) / minerjiage);
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj1.GetComponent<Text>().text = (this.minerjiage * number).ToString();
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj2.GetComponent<Text>().text = number.ToString();
+                    UpdateText(gameObjects[1].GetComponent<input_box_pop_up_window_item>().contentobj.GetComponent<Text>());
+                }
+            }
+            else if (type == 2)
+            {
+                if (number != max)
+                {
+                    number = max;
+                    max = (int)(float.Parse(AssestPanel.instance.Coin.text) / minerjiage);
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj1.GetComponent<Text>().text = (this.minerjiage * number).ToString();
+                    gameObjects[0].GetComponent<input_box_pop_up_window_item>().numbertextobj2.GetComponent<Text>().text = number.ToString();
+                    UpdateText(gameObjects[1].GetComponent<input_box_pop_up_window_item>().contentobj.GetComponent<Text>());
+                }
+            }
+        });
+
+
+        gameObjects[2].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
+        {
+            if (type == 0)
+            {
+                gameObject.GetComponent<input_box_pop_up_window>().destroy();
+            }
+            else if (type == 1)
+            {
+
+                if (isMinr)
+                {
+                    GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买捕鱼精灵
+                    generateForFisherElf.Num = Num;
+                    generateForFisherElf.Count = Convert.ToInt32(number);
+                    string response = await web.SendRequest(web.URL + "/Voucher/GenerateForFisherElf", "POST", JsonUtility.ToJson(generateForFisherElf));
+                    Debug.Log(response);
+                    Promptmgr.Instance.PromptBubble("购买精灵成功", Color.black, Color.blue);
+                }
+              
+            }
+        });
+    }
+
+
+
+    void UpdateText(Text text)
+    {
+
+        text.text = number.ToString();
+    }
+
+
 }
Author	SHA1	Message	Date
shurongsen	357f6d9be6	add	2024-11-05 01:59:52 +08:00
shurongsen	d5d56a89f9	Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks	2024-11-04 23:22:05 +08:00
shurongsen	a361bd68c5	add	2024-11-04 23:21:48 +08:00