add

meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity

@@ -1879,7 +1879,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 347020760}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.01, y: -2.79, z: 0}
+  m_LocalPosition: {x: 5.11, y: -2.37, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity

@@ -300,6 +300,7 @@ GameObject:
   m_Component:
   - component: {fileID: 56346249}
   - component: {fileID: 56346250}
+  - component: {fileID: 56346251}
   m_Layer: 0
   m_Name: top3
   m_TagString: Untagged
@@ -322,7 +323,6 @@ Transform:
   - {fileID: 733512740}
   - {fileID: 1616921918}
   - {fileID: 1621691473}
-  - {fileID: 423906224}
   - {fileID: 2088916450}
   - {fileID: 102276562}
   m_Father: {fileID: 787643888}
@@ -354,6 +354,52 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 6.8632345, y: 4.257353}
   m_EdgeRadius: 0
+--- !u!114 &56346251
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 56346248}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e14236262b3cead4597580fdb841652f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fishManPrefab: {fileID: 9155457817904467836, guid: 12cf12d921b09b343bdadb6638b7447c, type: 3}
+  startPos: {fileID: 423906224}
+  endPos: {fileID: 2079495230}
+  type: 2
+  isbuy: 0
+  ActivateValue: 300
+  Num: 16
+  Type: 0
+  paths:
+  - pathPoints:
+    - {fileID: 78513529}
+    - {fileID: 1127531261}
+    - {fileID: 2043484084}
+    - {fileID: 1863374491}
+    - {fileID: 323654385}
+    - {fileID: 2079495230}
+  - pathPoints:
+    - {fileID: 964032477}
+    - {fileID: 1935800548}
+    - {fileID: 258516099}
+    - {fileID: 1004232774}
+    - {fileID: 2133241629}
+    - {fileID: 2024839349}
+    - {fileID: 2079495230}
+  pathsNeedTimer: 30
+  fishingNeedTimer: 30
+  restTimer: 5
+  getgoldnumber: 100
+  goldshop: {fileID: 1621691472}
+  goldNumerTextPro: {fileID: 1113669198}
+  HightLight: {fileID: 102276561}
+  Btntrans: {fileID: 56346249}
+  FishPrice: 0
+  map: {fileID: 1987825450}
 --- !u!1 &78513528
 GameObject:
   m_ObjectHideFlags: 0
@@ -468,7 +514,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 56346249}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &102276563
 SpriteRenderer:
@@ -1749,7 +1795,7 @@ Transform:
   - {fileID: 1445626387}
   - {fileID: 339905144}
   m_Father: {fileID: 1005748196}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &339905143
 GameObject:
@@ -2027,12 +2073,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 423906223}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.76, y: -2.75, z: 0}
+  m_LocalPosition: {x: -2.8899994, y: -2.3699985, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 56346249}
+  m_Father: {fileID: 2088916450}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &499830625
 GameObject:
@@ -2261,10 +2307,12 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1067588907}
   - {fileID: 699182630}
   - {fileID: 1978754814}
+  - {fileID: 1392929798}
   m_Father: {fileID: 1048058358}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &559443430
 GameObject:
@@ -2276,6 +2324,7 @@ GameObject:
   m_Component:
   - component: {fileID: 559443431}
   - component: {fileID: 559443433}
+  - component: {fileID: 559443434}
   m_Layer: 0
   m_Name: top1
   m_TagString: Untagged
@@ -2298,7 +2347,6 @@ Transform:
   - {fileID: 325072784}
   - {fileID: 310426479}
   - {fileID: 1780327003}
-  - {fileID: 1734571546}
   - {fileID: 1005748196}
   - {fileID: 1504197551}
   m_Father: {fileID: 787643888}
@@ -2330,6 +2378,53 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 3.5458484, y: 3.319406}
   m_EdgeRadius: 0
+--- !u!114 &559443434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559443430}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e14236262b3cead4597580fdb841652f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fishManPrefab: {fileID: 8759413356347716201, guid: 895559f95d4ca3b47a49156ec979e40c, type: 3}
+  startPos: {fileID: 1734571546}
+  endPos: {fileID: 736711439}
+  type: 0
+  isbuy: 0
+  ActivateValue: 300
+  Num: 16
+  Type: 0
+  paths:
+  - pathPoints:
+    - {fileID: 1752358036}
+    - {fileID: 1082195120}
+    - {fileID: 2147345441}
+    - {fileID: 1445626387}
+    - {fileID: 339905144}
+    - {fileID: 736711439}
+  - pathPoints:
+    - {fileID: 211894328}
+    - {fileID: 1607578808}
+    - {fileID: 207042482}
+    - {fileID: 56093340}
+    - {fileID: 1086483495}
+    - {fileID: 258008391}
+    - {fileID: 1576490689}
+    - {fileID: 736711439}
+  pathsNeedTimer: 30
+  fishingNeedTimer: 30
+  restTimer: 5
+  getgoldnumber: 100
+  goldshop: {fileID: 1780327002}
+  goldNumerTextPro: {fileID: 979148971}
+  HightLight: {fileID: 1504197550}
+  Btntrans: {fileID: 559443431}
+  FishPrice: 0
+  map: {fileID: 1987825450}
 --- !u!1 &579933540
 GameObject:
   m_ObjectHideFlags: 0
@@ -2360,7 +2455,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1048058358}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &579933542
 SpriteRenderer:
@@ -2448,7 +2543,7 @@ Transform:
   - {fileID: 1626887113}
   - {fileID: 729948191}
   m_Father: {fileID: 548580335}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &729948190
 GameObject:
@@ -2475,7 +2570,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 729948190}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 5.57, y: 1.73, z: 0}
+  m_LocalPosition: {x: 5.08, y: 0.65, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 1
   m_Children: []
@@ -2618,6 +2713,90 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &736711438
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 736711439}
+  - component: {fileID: 736711440}
+  m_Layer: 0
+  m_Name: endpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &736711439
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 736711438}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 6.9, y: 0.35, z: 0}
+  m_LocalScale: {x: 0.49999997, y: 0.49999997, z: 0.49999997}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 1005748196}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &736711440
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 736711438}
+  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: 1018a775041383b4a83b311a91692a3d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.7, y: 0.7}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &784479835
 GameObject:
   m_ObjectHideFlags: 0
@@ -3079,7 +3258,7 @@ Transform:
   - {fileID: 258008391}
   - {fileID: 1576490689}
   m_Father: {fileID: 1005748196}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &827362919
 GameObject:
@@ -3227,90 +3406,6 @@ PolygonCollider2D:
       - {x: 5.6313424, y: -10.038812}
       - {x: 5.664058, y: 4.307649}
       - {x: 5.618172, y: 9.981446}
---- !u!1 &874517736
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 874517737}
-  - component: {fileID: 874517738}
-  m_Layer: 0
-  m_Name: Cube7
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &874517737
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 874517736}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 6.19, y: 2.82, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 1506570752}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &874517738
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 874517736}
-  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: 1018a775041383b4a83b311a91692a3d, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 0.7, y: 0.7}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &914569105
 GameObject:
   m_ObjectHideFlags: 0
@@ -3763,10 +3858,12 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1734571546}
   - {fileID: 327705043}
   - {fileID: 815685643}
+  - {fileID: 736711439}
   m_Father: {fileID: 559443431}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1048058357
 GameObject:
@@ -3778,6 +3875,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1048058358}
   - component: {fileID: 1048058359}
+  - component: {fileID: 1048058360}
   m_Layer: 0
   m_Name: top2
   m_TagString: Untagged
@@ -3800,7 +3898,6 @@ Transform:
   - {fileID: 20416359}
   - {fileID: 1380133528}
   - {fileID: 784479836}
-  - {fileID: 1067588907}
   - {fileID: 548580335}
   - {fileID: 579933541}
   m_Father: {fileID: 787643888}
@@ -3832,6 +3929,53 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 5.8965707, y: 4.327156}
   m_EdgeRadius: 0
+--- !u!114 &1048058360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1048058357}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e14236262b3cead4597580fdb841652f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fishManPrefab: {fileID: 9027535534103199909, guid: 930941387799a9d479889a373bafdc8e, type: 3}
+  startPos: {fileID: 1067588907}
+  endPos: {fileID: 1392929798}
+  type: 1
+  isbuy: 0
+  ActivateValue: 200
+  Num: 16
+  Type: 0
+  paths:
+  - pathPoints:
+    - {fileID: 199805572}
+    - {fileID: 827362920}
+    - {fileID: 1332269050}
+    - {fileID: 1626887113}
+    - {fileID: 729948191}
+    - {fileID: 1392929798}
+  - pathPoints:
+    - {fileID: 914569106}
+    - {fileID: 499830626}
+    - {fileID: 2063902009}
+    - {fileID: 1585686091}
+    - {fileID: 1328318913}
+    - {fileID: 2034494837}
+    - {fileID: 318175897}
+    - {fileID: 1392929798}
+  pathsNeedTimer: 30
+  fishingNeedTimer: 30
+  restTimer: 5
+  getgoldnumber: 100
+  goldshop: {fileID: 784479835}
+  goldNumerTextPro: {fileID: 1634093115}
+  HightLight: {fileID: 579933540}
+  Btntrans: {fileID: 1048058358}
+  FishPrice: 0
+  map: {fileID: 1987825450}
 --- !u!1 &1067588906
 GameObject:
   m_ObjectHideFlags: 0
@@ -3856,12 +4000,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1067588906}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.21, y: -1.82, z: 0}
+  m_LocalPosition: {x: -2.0899997, y: -1.9799999, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1048058358}
+  m_Father: {fileID: 548580335}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1082195119
 GameObject:
@@ -4597,6 +4741,90 @@ SortingGroup:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 99
+--- !u!1 &1392929797
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1392929798}
+  - component: {fileID: 1392929799}
+  m_Layer: 0
+  m_Name: endpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1392929798
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1392929797}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 6.2, y: 1.29, z: 0}
+  m_LocalScale: {x: 0.49999997, y: 0.49999997, z: 0.49999997}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 548580335}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1392929799
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1392929797}
+  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: 1018a775041383b4a83b311a91692a3d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.7, y: 0.7}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &1407114876
 GameObject:
   m_ObjectHideFlags: 0
@@ -4977,7 +5205,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 559443431}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1504197552
 SpriteRenderer:
@@ -5065,9 +5293,8 @@ Transform:
   - {fileID: 1004232774}
   - {fileID: 2133241629}
   - {fileID: 2024839349}
-  - {fileID: 874517737}
   m_Father: {fileID: 2088916450}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1517212221
 GameObject:
@@ -5911,7 +6138,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1634093113}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6080,13 +6307,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1734571545}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.46, y: -2.358, z: 0}
+  m_LocalPosition: {x: -1.46, y: -2.3580003, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 559443431}
+  m_Father: {fileID: 1005748196}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1752358035
 GameObject:
@@ -6490,7 +6717,7 @@ Transform:
   - {fileID: 1863374491}
   - {fileID: 323654385}
   m_Father: {fileID: 2088916450}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1863374490
 GameObject:
@@ -7058,7 +7285,7 @@ Transform:
   - {fileID: 2034494837}
   - {fileID: 318175897}
   m_Father: {fileID: 548580335}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1987825450
 GameObject:
@@ -7069,6 +7296,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1987825451}
+  - component: {fileID: 1987825452}
   m_Layer: 0
   m_Name: Map
   m_TagString: Untagged
@@ -7093,6 +7321,23 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1987825452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987825450}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b8f990109b98f2f43864c69530d23d5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  currencType: 0
+  listgameobject:
+  - {fileID: 559443430}
+  - {fileID: 1048058357}
+  - {fileID: 56346248}
 --- !u!1 &2024839348
 GameObject:
   m_ObjectHideFlags: 0
@@ -7429,6 +7674,90 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &2079495229
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2079495230}
+  - component: {fileID: 2079495231}
+  m_Layer: 0
+  m_Name: endpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2079495230
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2079495229}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 6.1899996, y: 2.8200002, z: 0}
+  m_LocalScale: {x: 0.49999997, y: 0.49999997, z: 0.49999997}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 2088916450}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2079495231
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2079495229}
+  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: 1018a775041383b4a83b311a91692a3d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.7, y: 0.7}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &2088916449
 GameObject:
   m_ObjectHideFlags: 0
@@ -7457,10 +7786,12 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 423906224}
   - {fileID: 1835247474}
   - {fileID: 1506570752}
+  - {fileID: 2079495230}
   m_Father: {fileID: 56346249}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2133241628
 GameObject:

meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs

@@ -116,7 +116,7 @@ public class input_box_pop_up_window : MonoBehaviour
     }
     public void trydestroy()
     {
-        Debug.Log(!is_force);
+       
         if (!is_force)
         {
             destroy();

meng_yao/Assets/script/cultivation_gold_coin_Island/landContorl.cs

@@ -55,7 +55,6 @@ public class landContorl : MonoBehaviour
 
     private void Start()
     {      
-        FishPrice = 10;
 
 
         if (goldshop == null)

meng_yao/Assets/script/cultivation_gold_gold_Island/boy_jinsha.cs

@@ -18,7 +18,7 @@ public class boy_jinsha:mount
     {
         //²âÊÔÓÃ
         Login login = new Login();
-        login.Phone = "test1";
+        login.Phone = "tast4";
         await web.SendRequest(web.URL + "/Player/Login", "POST", JsonUtility.ToJson(login));
 
 
@@ -44,8 +44,9 @@ public class boy_jinsha:mount
         int index = 0;
         foreach (int key in ActivateValues.Keys)
         {
-            listgameobject[index].GetComponent<landContorl>().ActivateValue = key;
+           
-            listgameobject[index].GetComponent<landContorl>().Num = ActivateValues[key];
+            listgameobject[index].GetComponent<landContorl_jinsha>().ActivateValue = key;
+            listgameobject[index].GetComponent<landContorl_jinsha>().Num = ActivateValues[key];
 
             index++;
         }
@@ -69,11 +70,10 @@ public class boy_jinsha:mount
             {
                 foreach (GameObject gameObject in listgameobject)
                 {
-                    if (gameObject.GetComponent<landContorl>().ActivateValue == item.ActivateValue)//Èç¹û¼Û¸ñÒ»ÖÂ
+                    if (gameObject.GetComponent<landContorl_jinsha>().ActivateValue == item.ActivateValue)//Èç¹û¼Û¸ñÒ»ÖÂ
                     {
                         Debug.Log(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString());
-                        gameObject.GetComponent<landContorl>().add_fish(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString());
+                        gameObject.GetComponent<landContorl_jinsha>().add_fish(item.RemainEndureTime.ToString() + '/' + item.EndureTime.ToString());                       
-                        //gameObject.GetComponent<landContorl>().add_fish();
                     }
                 }
             }

meng_yao/Assets/script/cultivation_gold_gold_Island/landContorl_jinsha.cs

@@ -14,7 +14,7 @@ public class landContorl_jinsha : MonoBehaviour
 
     public int type;
     public bool isbuy = false;
-    public bool isGoldLand = false;
+   // public bool isGoldLand = false;
     public float ActivateValue = 0;
     public int Num = 0;
     public int Type = 0;
@@ -61,7 +61,7 @@ public class landContorl_jinsha : MonoBehaviour
 
         HightLight.SetActive(false);
 
-        if (!isGoldLand) return;
+        //if (!isGoldLand) return;
         shopman.instance.OnType += addman;
     }
     private void Update()
@@ -71,91 +71,92 @@ public class landContorl_jinsha : MonoBehaviour
 
     private void OnDisable()
     {
-        if (!isGoldLand) return;
+       // if (!isGoldLand) return;
         shopman.instance.OnType -= addman;
     }
 
-    void addman(int type, int number)
+    async void  addman(int type, int number)
     {
         if (type == this.type)
         {          
-            if (isbuy == false)
+            GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买渔夫
+            generateForFisherElf.Num = Num;
+            generateForFisherElf.Count = 1;
+            string userponse = await web.SendRequest(web.URL + "/Voucher/GenerateForFisherElf", "POST", JsonUtility.ToJson(generateForFisherElf));
+            ids itemList = JsonUtility.FromJson<ids>(userponse);
+            if (itemList.ErrorCode == 0) // 如果购买成功
             {
-                isbuy = true;
+
-                PlayerManager.Instance.SetMoney(MoneyType.Coins, -FishPrice);
+                foreach (string item in itemList.Ids)
-                Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);
+                {
+                    Use use = new Use(); // 使用渔夫
+                    use.Id = item;
+                    string rect = await web.SendRequest(web.URL + "/Voucher/Use", "POST", JsonUtility.ToJson(use));
+                    Res res = JsonUtility.FromJson<ids>(userponse);
+                    if (res.ErrorCode == 0)
+                    {
+                        if (!this.isbuy)
+                        {
+                            this.isbuy = true;
+                            Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);                            
+                        }
+                        else
+                        {
+                            this.isbuy = true;
+                            Promptmgr.Instance.PromptBubble("已经购买了", Color.black, Color.red);
+                        }
+
+                        
+
+                    }
+                    else
+                    {
+                        Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
+                    }
+                }
             }
-            else
+            else// 如果购买失败
             {
-                Promptmgr.Instance.PromptBubble("已经购买了", Color.black, Color.red);
+                Promptmgr.Instance.PromptBubble("购买失败", Color.black, Color.red);
             }
+            Debug.Log(Struct.StructToString(itemList, 3));
+
         }
     }
 
     private void OnMouseDown()
     {
-        if (fishMan != null)
-        {
-            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
-            return;
-        }
       
         OnClick();
     }
     private void OnTouch()
     {
-        if (fishMan != null)
+       
-        {
-            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
-            return;
-        }
 
         OnClick();
     }
 
-    async void OnClick()
+    private void OnClick()
     {
-        GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买渔夫
+        if(!isbuy)
-        generateForFisherElf.Num = Num;
-        generateForFisherElf.Count = 1;
-        string userponse = await web.SendRequest(web.URL + "/Voucher/GenerateForFisherElf", "POST", JsonUtility.ToJson(generateForFisherElf));
-        ids itemList = JsonUtility.FromJson<ids>(userponse);
-        if (itemList.ErrorCode == 0) // 如果购买成功
         {
-
+            Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red);
-            foreach (string item in itemList.Ids)
+            return;
-            {
-                Use use = new Use(); // 使用渔夫
-                use.Id = item;
-                string rect = await web.SendRequest(web.URL + "/Voucher/Use", "POST", JsonUtility.ToJson(use));
-                Res res = JsonUtility.FromJson<ids>(userponse);
-                if (res.ErrorCode == 0)
-                {
-                    Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.red);
-                    ScaleAni(Btntrans);
-                    add_fish();
-                    map.GetComponent<boy>().UpShipTimer();
-                }
-                else
-                {
-                    Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-                }
-            }
         }
-        else// 如果购买失败
-        {
-            Promptmgr.Instance.PromptBubble("购买失败", Color.black, Color.red);
-        }
-        Debug.Log(Struct.StructToString(itemList, 3));
 
+        ScaleAni(Btntrans);
+        add_fish();
+        map.GetComponent<boy_jinsha>().UpShipTimer();
     }
     public void add_fish(string timerStr = null)//生成船只
     {
         //倒计时
         // fishManShipContorl.UpShowTimer("测试");
         
+
         if (fishMan != null)
         {
+            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
             fishManShipContorl.UpShowTimer(timerStr);            
             return;
         }
@@ -167,6 +168,8 @@ public class landContorl_jinsha : MonoBehaviour
             fishManShipContorl = fishMan.GetComponent<shipcontorl>();
             MoveToStartPos();
 
+            this.isbuy = true;
+
             return;
         }
 
@@ -324,7 +327,6 @@ public class landContorl_jinsha : MonoBehaviour
     {
         Debug.LogError("返航完成,开始：真·摸-鱼，加钱");
 
-
         goldNumerTextPro.text = ActivateValue.ToString();
         fishMan.GetComponent<shipcontorl>().SetState(ShipState.draw);