Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Resources/Prefabs/GiveawayPanel.prefab

@@ -598,7 +598,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 1352567938435136180}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

meng_yao/Assets/Resources/Prefabs/Petcard.prefab

@@ -1,5 +1,82 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1429507185546270114
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1625957778717569666}
+  - component: {fileID: 776793019662387805}
+  - component: {fileID: 5946812892949155937}
+  m_Layer: 5
+  m_Name: Exhibitmusk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1625957778717569666
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1429507185546270114}
+  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: 2428789999161106782}
+  m_Father: {fileID: 3625754743845814640}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -36.5}
+  m_SizeDelta: {x: 149, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &776793019662387805
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1429507185546270114}
+  m_CullTransparentMesh: 1
+--- !u!114 &5946812892949155937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1429507185546270114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 21e707072e6435941bdf874623c98f70, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3625754743032774236
 GameObject:
   m_ObjectHideFlags: 0
@@ -420,6 +497,7 @@ RectTransform:
   - {fileID: 3625754743777606138}
   - {fileID: 1247601651492953792}
   - {fileID: 8028426795095517688}
+  - {fileID: 1625957778717569666}
   m_Father: {fileID: 3625754743905974222}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -596,6 +674,7 @@ MonoBehaviour:
   petName: {fileID: 3625754743777606137}
   petFightingBtn: {fileID: 8183562262175861975}
   petimage: {fileID: 1435522732351235256}
+  Exhibitmusk: {fileID: 1429507185546270114}
 --- !u!1 &3625754744018090714
 GameObject:
   m_ObjectHideFlags: 0
@@ -824,6 +903,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4337360550317741899
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2428789999161106782}
+  - component: {fileID: 8732791975609814378}
+  - component: {fileID: 1510092775894544561}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2428789999161106782
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4337360550317741899}
+  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: 1625957778717569666}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8732791975609814378
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4337360550317741899}
+  m_CullTransparentMesh: 1
+--- !u!114 &1510092775894544561
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4337360550317741899}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5C55\u793A\u4E2D"
 --- !u!1 &5254568200779861549
 GameObject:
   m_ObjectHideFlags: 0
@@ -1279,5 +1438,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 0
+  Exhibitmusk: {fileID: 0}
   lottery: {fileID: 0}
   showBtn: {fileID: 4173642057463196963}

meng_yao/Assets/Resources/Prefabs/TransferPanel.prefab

@@ -1048,6 +1048,7 @@ MonoBehaviour:
   SureBtn: {fileID: 6038184242068313351}
   CancelBtn: {fileID: 6038184242438127284}
   sendBtn: {fileID: 7628552445077456738}
+  sendtext: {fileID: 6325875366612292064}
 --- !u!1 &6038184242438127282
 GameObject:
   m_ObjectHideFlags: 0
@@ -1249,7 +1250,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8F93\u5165"
+  m_Text: "\u8BF7\u8F93\u5165\u516D\u4F4D\u6570\u5B57\u5BC6\u7801"
 --- !u!1 &6038184243113732049
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab

@@ -385,7 +385,7 @@ GameObject:
   - component: {fileID: 5842859360270671265}
   - component: {fileID: 5842859360270671266}
   m_Layer: 5
-  m_Name: Button (Legacy) (1)
+  m_Name: Surnbtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -520,7 +520,7 @@ GameObject:
   - component: {fileID: 8761031929982800743}
   - component: {fileID: 8761031928609456141}
   m_Layer: 5
-  m_Name: Text (Legacy)
+  m_Name: suretxt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

meng_yao/Assets/Scenes/loading.unity

@@ -232,12 +232,13 @@ PrefabInstance:
     - target: {fileID: 5327073757694762713, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
       propertyPath: canvs
       value: 
-      objectReference: {fileID: 934962570}
+      objectReference: {fileID: 1327461860}
     - target: {fileID: 5327073757694762713, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
       propertyPath: PromptPrefab
       value: 
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 5327073757694762713, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
 --- !u!1 &111255128
 GameObject:
@@ -893,11 +894,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 791536910}
   m_CullTransparentMesh: 1
---- !u!1 &934962570 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
-  m_PrefabInstance: {fileID: 107147069}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1091198944
 GameObject:
   m_ObjectHideFlags: 0
@@ -990,7 +986,7 @@ GameObject:
   - component: {fileID: 1125672643}
   m_Layer: 5
   m_Name: Canvas
-  m_TagString: Untagged
+  m_TagString: Canvas
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1114,6 +1110,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   globalFrameRate: 100
+--- !u!1 &1327461860 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+  m_PrefabInstance: {fileID: 107147069}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1348751385
 GameObject:
   m_ObjectHideFlags: 0
@@ -1126,6 +1127,7 @@ GameObject:
   - component: {fileID: 1348751387}
   - component: {fileID: 1348751386}
   - component: {fileID: 1348751389}
+  - component: {fileID: 1348751390}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -1218,6 +1220,20 @@ MonoBehaviour:
   checkCode: {fileID: 0}
   register: {fileID: 0}
   playerInfo: {fileID: 0}
+--- !u!114 &1348751390
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348751385}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea8231e49b8e6c440b4ede383765832d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PromptPrefab: {fileID: 0}
+  canvs: {fileID: 1125672637}
 --- !u!1 &1352207951
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/res/clan_slices/btn_fy.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 181f326effd2c0a4cb0fa2327117afa7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/res/clan_slices/img_wfjs_bg.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: dbc0120e0b306bc44ac9dc44185649f2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/res/eco_tree_achievement/e42b13a22ef4fc10d63a74171178a51.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 21e707072e6435941bdf874623c98f70
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/Manager/Promptmgr.cs

@@ -15,14 +15,16 @@ public class Promptmgr : MonoBehaviour
 
     private float timer;
     // Start is called before the first frame update
+
+    
+
     void Start()
     {
 
-        Instance = this;
+        Instance = this; 
-        DontDestroyOnLoad(this);
         PromptPrefab = (GameObject)Resources.Load("Prefabs/Prompt");
         PromptWhiltePrefab = (GameObject)Resources.Load("Prefabs/PromptWhite");
-
+    
     }
 
     private void Update()

meng_yao/Assets/script/TanChuang/Lottery.cs

@@ -14,6 +14,8 @@ public class Lottery : MonoBehaviour
 
     public List<Sprite> petsp = new List<Sprite>();
     public List<PetFightingBtn> fightinglist = new List<PetFightingBtn>();
+    public List<GameObject> ExuExhibitmusklist = new List<GameObject>();
+
     public Button ClosefightingBtn;
     public List<GameObject> objitem = new List<GameObject>();
     public List<string> shenxiaocard = new List<string>();
@@ -41,6 +43,14 @@ public class Lottery : MonoBehaviour
         }
     }
 
+    public void Closemusk()//Òþ²ØËùÓÐչʾµÄmusk
+    {
+        foreach (GameObject obj in ExuExhibitmusklist)
+        {
+            obj.gameObject.SetActive(false);
+        }
+    }
+
     async void Update_itemClick()
     {
         PetHome info = await Scene_main_jiekou.instance.getPetHomes();
@@ -48,11 +58,18 @@ public class Lottery : MonoBehaviour
         {
             GameObject obj = GameObject.Instantiate(petItem, Connect);
             objitem.Add(obj);
+           
             obj.GetComponent<PetCard>().petName.text = info.data.items[i].name;
             obj.GetComponent<PetCard>().petFightingBtn.id = info.data.items[i].id;
             obj.GetComponent<PetCard>().petimage.sprite = showSprite(info.data.items[i].name);
             obj.GetComponent<PetCard>().petFightingBtn.lottery = this;
-            fightinglist.Add(obj.GetComponent<PetCard>().petFightingBtn);
+            obj.GetComponent<PetCard>().petFightingBtn.Exhibitmusk = obj.GetComponent<PetCard>().Exhibitmusk;
+           fightinglist.Add(obj.GetComponent<PetCard>().petFightingBtn);
+            ExuExhibitmusklist.Add(obj.GetComponent<PetCard>().Exhibitmusk);
+            if (info.data.items[i].battles_status == 1)
+            {
+                obj.GetComponent<PetCard>().petFightingBtn.Exhibitmusk.SetActive(true);
+            }
         }
 
     }

meng_yao/Assets/script/scene_Main/PetCard.cs

@@ -7,6 +7,7 @@ public class PetCard : MonoBehaviour
     public Text petName;
     public PetFightingBtn petFightingBtn;
     public Image petimage;
+    public GameObject Exhibitmusk;
     void Start()
     {
         

meng_yao/Assets/script/scene_Main/PetFightingBtn.cs

@@ -6,7 +6,7 @@ public class PetFightingBtn : MonoBehaviour
 {
     Button figntBtn;
     public int id;
-    
+    public GameObject Exhibitmusk;
     public Lottery lottery;
     public Button showBtn;
     void Start()
@@ -15,12 +15,12 @@ public class PetFightingBtn : MonoBehaviour
         figntBtn.onClick.AddListener(fightClick);
         showBtn.onClick.AddListener(showbtnClick);
         figntBtn.gameObject.SetActive(false);
+        //Exhibitmusk.gameObject.SetActive(false);
     }
 
      void showbtnClick()
     {
         lottery.CloseBtnClick();
-
         figntBtn.gameObject.SetActive(true);
     }
 
@@ -31,8 +31,9 @@ public class PetFightingBtn : MonoBehaviour
         {
             petBettleInfoResponse petinfo = await Scene_main_jiekou.instance.getPetBettleInfos();
             WaterPanel.instance.Updated_petinfo(petinfo);
+            lottery.Closemusk();
             this.gameObject.SetActive(false);
-
+            Exhibitmusk.gameObject.SetActive(true);
         }
         else
         {

meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs

@@ -169,9 +169,9 @@ public class Scene_main_jiekou :MonoBehaviour
         return await teamData.TreeTeamData();
     }
 
-    public async Task<TreeFansListResponse> TreeFansListS()//生态树团队粉丝列表
+    public async Task<TreeFansListResponse> TreeFansListS(string keyword)//生态树团队粉丝列表
     {
-        return await treeFansList.TreeFansList();
+        return await treeFansList.TreeFansList(keyword);
     }
 
     public async Task<bool> TreeGetWaters(int index, string transId)//生态树水滴采集

meng_yao/Assets/script/scene_Main/Thebestfishman.meta

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

meng_yao/Assets/script/scene_Main/Thebestfishman/WebBeton.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+using Newtonsoft.Json;
+public class WebBeton : MonoBehaviour
+{
+    private ClientWebSocket _webSocket;
+    private const string WebSocketUri = "ws://47.95.201.243:9527/api/ws";
+    private const string AuthorizationValue = "Bearer VH8XwWuu_iVjEPYQmCq1E2rITTg";
+    public int count = 0;
+
+    private async void Start()
+    {
+        await ConnectWebSocket();
+
+        // 准备 JSON 数据
+        var message = new
+        {
+            code = "FISHING",
+            content = "{\"action\":\"BETTING\",\"count\":1}"
+        };
+
+        // 将对象序列化为 JSON 字符串
+        string jsonMessage = JsonUtility.ToJson(message);
+
+        // 调用发送方法
+        await SendJsonMessage(count);
+    }
+
+    private async Task ConnectWebSocket()
+    {
+        _webSocket = new ClientWebSocket();
+
+        // 添加 Authorization 头
+        _webSocket.Options.SetRequestHeader("Authorization", AuthorizationValue);
+
+        try
+        {
+            Debug.Log("正在连接到 WebSocket...");
+            await _webSocket.ConnectAsync(new Uri(WebSocketUri), CancellationToken.None);
+            Debug.Log("WebSocket 连接成功！");
+
+            // 开始接收消息
+            _ = ReceiveMessages();
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"WebSocket 连接失败：{e.Message}");
+        }
+    }
+
+    private async Task ReceiveMessages()
+    {
+        var buffer = new byte[1024];
+
+        try
+        {
+            while (_webSocket.State == WebSocketState.Open)
+            {
+                var result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+
+                if (result.MessageType == WebSocketMessageType.Close)
+                {
+                    Debug.Log("WebSocket 连接已被服务器关闭。");
+                    await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "关闭连接", CancellationToken.None);
+                }
+                else
+                {
+                    var message = Encoding.UTF8.GetString(buffer, 0, result.Count);
+                    Debug.Log($"接收到消息：{message}");
+
+
+                    // 解析消息为 Fishresponse 对象
+                    FishBetonresponse fishResponse = JsonConvert.DeserializeObject<FishBetonresponse>(message);
+                    Promptmgr.Instance.PromptBubble(fishResponse.message);
+                    // 检查是否成功反序列化
+                    if (fishResponse != null && fishResponse.data != null)
+                    {
+                        Debug.Log($"余额: {fishResponse.data.balance}");
+                        Debug.Log($"价格: {fishResponse.data.price}");
+                        Debug.Log($"剩余数量: {fishResponse.data.surplus_count}");
+                    }
+                    else
+                    {
+                        Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
+                    }
+
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"接收消息时出错：{e.Message}");
+        }
+    }
+
+
+    public async Task SendJsonMessage(int count)
+    {
+        if (_webSocket == null || _webSocket.State != WebSocketState.Open)
+        {
+            Debug.LogError("WebSocket 未连接，无法发送消息。");
+            return;
+        }
+
+        try
+        {
+            var message = new
+            {
+                code = "FISHING",
+                content = $"{{\"action\":\"BETTING\",\"count\":{count}}}"
+            };
+
+            // 将对象序列化为 JSON 字符串
+            string jsonMessage = JsonConvert.SerializeObject(message);
+            var encodedMessage = Encoding.UTF8.GetBytes(jsonMessage);
+            var buffer = new ArraySegment<byte>(encodedMessage);
+
+            await _webSocket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
+            Debug.Log($"已发送 JSON 消息：{jsonMessage}");
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"发送消息时出错：{e.Message}");
+        }
+    }
+
+    private async void OnApplicationQuit()
+    {
+        if (_webSocket != null && _webSocket.State == WebSocketState.Open)
+        {
+            await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "应用程序退出", CancellationToken.None);
+            _webSocket.Dispose();
+            Debug.Log("WebSocket 连接已关闭。");
+        }
+    }
+}

meng_yao/Assets/script/scene_Main/Thebestfishman/WebBeton.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1e7c2d58554fa36479761c2cbf8e106b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/Thebestfishman/WebFishing.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+using Newtonsoft.Json;
+using System.Drawing;
+public class WebFishing : MonoBehaviour
+{
+    private ClientWebSocket _webSocket;
+    private const string WebSocketUri = "ws://47.95.201.243:9527/api/ws";
+    private const string AuthorizationValue = "Bearer VH8XwWuu_iVjEPYQmCq1E2rITTg";
+
+    private async void Start()
+    {
+        await ConnectWebSocket();
+
+        // 准备 JSON 数据
+        var message = new
+        {
+            code = "FISHING",
+            content = "{\"action\":\"FISHING\"}"
+        };
+
+        // 将对象序列化为 JSON 字符串
+        string jsonMessage = JsonUtility.ToJson(message);
+
+        // 调用发送方法
+        await SendJsonMessage("{ \"code\": \"FISHING\", \"content\": \"{\\\"action\\\":\\\"FISHING\\\"}\" }");
+    }
+
+    private async Task ConnectWebSocket()
+    {
+        _webSocket = new ClientWebSocket();
+
+        // 添加 Authorization 头
+        _webSocket.Options.SetRequestHeader("Authorization", AuthorizationValue);
+
+        try
+        {
+            Debug.Log("正在连接到 WebSocket...");
+            await _webSocket.ConnectAsync(new Uri(WebSocketUri), CancellationToken.None);
+            Debug.Log("WebSocket 连接成功！");
+
+            // 开始接收消息
+            _ = ReceiveMessages();
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"WebSocket 连接失败：{e.Message}");
+        }
+    }
+
+    private async Task ReceiveMessages()
+    {
+        var buffer = new byte[1024];
+
+        try
+        {
+            while (_webSocket.State == WebSocketState.Open)
+            {
+                var result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+
+                if (result.MessageType == WebSocketMessageType.Close)
+                {
+                    Debug.Log("WebSocket 连接已被服务器关闭。");
+                    await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "关闭连接", CancellationToken.None);
+                }
+                else
+                {
+                    var message = Encoding.UTF8.GetString(buffer, 0, result.Count);
+                    Debug.Log($"接收到消息：{message}");
+
+
+                    // 解析消息为 Fishresponse 对象
+                    Fishingresponse fishResponse = JsonConvert.DeserializeObject<Fishingresponse>(message);
+                    Promptmgr.Instance.PromptBubble(fishResponse.message);
+                    // 检查是否成功反序列化
+                    if (fishResponse != null && fishResponse.data != null)
+                    {
+                        Debug.Log($"余额: {fishResponse.data.balance}");
+                        Debug.Log($"价格: {fishResponse.data.price}");
+                        Debug.Log($"剩余数量: {fishResponse.data.surplus_count}");
+                        Debug.Log($"余额: {fishResponse.data.prize.id}");
+                        Debug.Log($"余额: {fishResponse.data.prize.name}");
+                        Debug.Log($"余额: {fishResponse.data.prize.type}");
+                    }
+                    else
+                    {
+                        Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
+                    }
+
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"接收消息时出错：{e.Message}");
+        }
+    }
+
+
+    public async Task SendJsonMessage(string json)
+    {
+        if (_webSocket == null || _webSocket.State != WebSocketState.Open)
+        {
+            Debug.LogError("WebSocket 未连接，无法发送消息。");
+            return;
+        }
+
+        try
+        {
+            var encodedMessage = Encoding.UTF8.GetBytes(json);
+            var buffer = new ArraySegment<byte>(encodedMessage);
+
+            await _webSocket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
+            Debug.Log($"已发送 JSON 消息：{json}");
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"发送消息时出错：{e.Message}");
+        }
+    }
+
+    private async void OnApplicationQuit()
+    {
+        if (_webSocket != null && _webSocket.State == WebSocketState.Open)
+        {
+            await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "应用程序退出", CancellationToken.None);
+            _webSocket.Dispose();
+            Debug.Log("WebSocket 连接已关闭。");
+        }
+    }
+}
+

meng_yao/Assets/script/scene_Main/Thebestfishman/WebFishing.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 29b5ece7ff1f9c946aee00668809f293
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs

@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.Net.WebSockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using UnityEngine;
+using Newtonsoft.Json;
+public class WebJoinroom : MonoBehaviour
+{
+    private ClientWebSocket _webSocket;
+    private const string WebSocketUri = "ws://47.95.201.243:9527/api/ws";
+    private const string AuthorizationValue = "Bearer VH8XwWuu_iVjEPYQmCq1E2rITTg";
+    public int count = 0;
+
+    private async void Start()
+    {
+        await ConnectWebSocket();
+
+        // 准备 JSON 数据
+        var message = new
+        {
+            code = "FISHING",
+            content = "{\\\"action\\\":\\\"INFO\\\"}"
+        };
+
+        // 将对象序列化为 JSON 字符串
+        string jsonMessage = JsonUtility.ToJson(message);
+
+        // 调用发送方法
+        await SendJsonMessage("{ \"code\": \"FISHING\", \"content\": \"{\\\"action\\\":\\\"INFO\\\"}\" }");
+        await SendJsonMessage(count);
+        await SendJsonMessage("{ \"code\": \"FISHING\", \"content\": \"{\\\"action\\\":\\\"FISHING\\\"}\" }");
+    }
+
+    private async Task ConnectWebSocket()
+    {
+        _webSocket = new ClientWebSocket();
+
+        // 添加 Authorization 头
+        _webSocket.Options.SetRequestHeader("Authorization", AuthorizationValue);
+
+        try
+        {
+            Debug.Log("正在连接到 WebSocket...");
+            await _webSocket.ConnectAsync(new Uri(WebSocketUri), CancellationToken.None);
+            Debug.Log("WebSocket 连接成功！");
+
+            // 开始接收消息
+            _ = ReceiveMessages();
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"WebSocket 连接失败：{e.Message}");
+        }
+    }
+
+    private async Task ReceiveMessages()
+    {
+        var buffer = new byte[1024];
+
+        try
+        {
+            while (_webSocket.State == WebSocketState.Open)
+            {
+                var result = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+
+                if (result.MessageType == WebSocketMessageType.Close)
+                {
+                    Debug.Log("WebSocket 连接已被服务器关闭。");
+                    await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "关闭连接", CancellationToken.None);
+                }
+                else
+                {
+                    var message = Encoding.UTF8.GetString(buffer, 0, result.Count);
+                    Debug.Log($"接收到消息：{message}");
+
+                    var baseResponse = JsonConvert.DeserializeObject<BaseResponse>(message);
+
+                    if (baseResponse != null)
+                    {
+                        switch (baseResponse.code)
+                        {
+                            // 解析消息为 Fishresponse 对象
+                            case "FISHING_INFO":
+                                // 解析为 FishJoinroomresponse 类型
+                                FishJoinroomresponse fishResponse = JsonConvert.DeserializeObject<FishJoinroomresponse>(message);
+                                if (fishResponse?.data != null)
+                                {
+                                    Debug.Log($"余额: {fishResponse.data.balance}");
+                                    Debug.Log($"价格: {fishResponse.data.price}");
+                                    Debug.Log($"剩余数量: {fishResponse.data.surplus_count}");
+                                    Debug.Log($"玩法介绍: {fishResponse.data.intro_text}");
+                                    foreach (var item in fishResponse.data.items)
+                                    {
+                                        Debug.Log($"物品ID: {item.id}, 物品名称: {item.name}, 类型: {item.type}");
+                                    }
+                                }
+                                break;
+
+                            case "FISHING_BETTING":
+                                // 解析消息为 Fishresponse 对象
+                                FishBetonresponse fishResponse1 = JsonConvert.DeserializeObject<FishBetonresponse>(message);
+                                Promptmgr.Instance.PromptBubble(fishResponse1.message);
+                                // 检查是否成功反序列化
+                                if (fishResponse1 != null && fishResponse1.data != null)
+                                {
+                                    Debug.Log($"余额: {fishResponse1.data.balance}");
+                                    Debug.Log($"价格: {fishResponse1.data.price}");
+                                    Debug.Log($"剩余数量: {fishResponse1.data.surplus_count}");
+                                }
+                                else
+                                {
+                                    Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
+                                }
+                                break;
+                            case "FISHING_FISHING":
+
+                                // 解析消息为 Fishresponse 对象
+                                Fishingresponse fishResponse2 = JsonConvert.DeserializeObject<Fishingresponse>(message);
+                                Promptmgr.Instance.PromptBubble(fishResponse2.message);
+                                // 检查是否成功反序列化
+                                if (fishResponse2 != null && fishResponse2.data != null)
+                                {
+                                    Debug.Log($"余额: {fishResponse2.data.balance}");
+                                    Debug.Log($"价格: {fishResponse2.data.price}");
+                                    Debug.Log($"剩余数量: {fishResponse2.data.surplus_count}");
+                                    Debug.Log($"余额: {fishResponse2.data.prize.id}");
+                                    Debug.Log($"余额: {fishResponse2.data.prize.name}");
+                                    Debug.Log($"余额: {fishResponse2.data.prize.type}");
+                                }
+                                else
+                                {
+                                    Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
+                                }
+                                break;
+                        }
+                    }
+                    
+
+                    
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"接收消息时出错：{e.Message}");
+        }
+    }
+
+    public async Task SendJsonMessage(int count)
+    {
+        if (_webSocket == null || _webSocket.State != WebSocketState.Open)
+        {
+            Debug.LogError("WebSocket 未连接，无法发送消息。");
+            return;
+        }
+
+        try
+        {
+            var message = new
+            {
+                code = "FISHING",
+                content = $"{{\"action\":\"BETTING\",\"count\":{count}}}"
+            };
+
+            // 将对象序列化为 JSON 字符串
+            string jsonMessage = JsonConvert.SerializeObject(message);
+            var encodedMessage = Encoding.UTF8.GetBytes(jsonMessage);
+            var buffer = new ArraySegment<byte>(encodedMessage);
+
+            await _webSocket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
+            Debug.Log($"已发送 JSON 消息：{jsonMessage}");
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"发送消息时出错：{e.Message}");
+        }
+    }
+    public async Task SendJsonMessage(string json)
+    {
+        if (_webSocket == null || _webSocket.State != WebSocketState.Open)
+        {
+            Debug.LogError("WebSocket 未连接，无法发送消息。");
+            return;
+        }
+
+        try
+        {
+            var encodedMessage = Encoding.UTF8.GetBytes(json);
+            var buffer = new ArraySegment<byte>(encodedMessage);
+
+            await _webSocket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
+            Debug.Log($"已发送 JSON 消息：{json}");
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"发送消息时出错：{e.Message}");
+        }
+    }
+
+    private async void OnApplicationQuit()
+    {
+        if (_webSocket != null && _webSocket.State == WebSocketState.Open)
+        {
+            await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "应用程序退出", CancellationToken.None);
+            _webSocket.Dispose();
+            Debug.Log("WebSocket 连接已关闭。");
+        }
+    }
+}
+public class BaseResponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+}
+// 返回数据类
+public class FishJoinroomresponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public FishJoinroomData data { get; set; }
+}
+
+public class FishJoinroomData
+{
+    public float balance { get; set; }
+    public int price { get; set; }
+    public int surplus_count { get; set; }
+    public string intro_text { get; set; }
+    public List<FishJoinroom> items { get; set; }
+}
+
+public class FishJoinroom
+{
+    public int id { get; set; }
+    public string name { get; set; }
+    public int type { get; set; }
+}
+public class Fishingresponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public FishingData data { get; set; }
+}
+public class FishingData
+{
+    public float balance { get; set; }
+    public int price { get; set; }
+    public int surplus_count { get; set; }
+    public Prize prize { get; set; }
+}
+public class Prize
+{
+    public int id { get; set; }
+    public string name { get; set; }
+    public int type { get; set; }
+}
+public class FishBetonresponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public FishBetondata data { get; set; }
+}
+public class FishBetondata
+{
+    public float balance { get; set; }
+    public int price { get; set; }
+    public int surplus_count { get; set; }
+}

meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec0bc6b6d3f7fd044847aebc4ea31592
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/Tree_team.cs

@@ -27,6 +27,10 @@ public class Tree_team : MonoBehaviour
     public GameObject item;
     public Transform parent;
 
+    public InputField searchInput;
+    public Button SearchBtn;
+
+
     [HideInInspector]
     public List<GameObject> itemlist=new List<GameObject>();
     async void OnEnable()
@@ -61,12 +65,43 @@ public class Tree_team : MonoBehaviour
         Init();
     }
 
-   
+    private void Start()
+    {
+        SearchBtn.onClick.AddListener(SecrchClick);
+    }
+
+   async void SecrchClick()
+    {
+        TreeFansListResponse response = await Scene_main_jiekou.instance.TreeFansListS(searchInput.text);
+
+        if (response.code == 200)
+        {
+            CleatClick();
+            for (int i = 0; i < response.Data.Pages.total_count; i++)
+            {
+                GameObject obj = GameObject.Instantiate(item, parent);
+                itemlist.Add(obj);
+                obj.transform.position = Vector3.zero;
+                obj.GetComponent<Tree_team_item>().itemName.text = response.Data.List[i].Nickname;
+                obj.GetComponent<Tree_team_item>().itemID.text = "id:" + response.Data.List[i].Uid;
+                obj.GetComponent<Tree_team_item>().itemTeamCount.text = "团队人数:" + response.Data.List[i].team_count;
+                obj.GetComponent<Tree_team_item>().Activecount.text = "活跃人数:" + response.Data.List[i].team_active_count;
+                obj.GetComponent<Tree_team_item>().RegisterTime.text = "注册时间:" + response.Data.List[i].create_time;
+                obj.GetComponent<Tree_team_item>().waterNumber.text = response.Data.List[i].water.ToString();
+                obj.GetComponent<Tree_team_item>().headsprite.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(response.Data.List[i].avatar_url);
+            }
+        }
+        else
+        {
+            Promptmgr.Instance.PromptBubble(response.message);
+        }
+      
+    }
 
     async void Init()
     {
-        TreeFansListResponse response = await Scene_main_jiekou.instance.TreeFansListS();
+        TreeFansListResponse response = await Scene_main_jiekou.instance.TreeFansListS(null);
-        Debug.Log(response);
+      
 
        for (int i=0;i< response.Data.Pages.total_count; i++)
         {
@@ -83,6 +118,16 @@ public class Tree_team : MonoBehaviour
         }
     }
 
+    void CleatClick()
+    {
+        foreach (GameObject ob in itemlist)
+        {
+            Destroy(ob);
+        }
+        itemlist.Clear();
+        Debug.Log("进入销毁");
+    }
+
     private void OnDisable()
     {
         foreach (GameObject ob in itemlist)

meng_yao/Assets/script/scene_Main/ui/ShopScroll.cs

@@ -32,6 +32,12 @@ public class ShopScroll : MonoBehaviour
     public Button PropertyFireBtn;
     public Button PropertySoilBtn;
 
+    public Button MyGoldBtn;
+    public Button MyTreeBtn;
+    public Button MyWaterBtn;
+    public Button MyFireBtn;
+    public Button MySoilBtn;
+
     public GameObject PropertyGoldscroll;
     public GameObject PropertyTreeScroll;
     public GameObject PropertyWaterScroll;
@@ -44,10 +50,24 @@ public class ShopScroll : MonoBehaviour
     public Image PropertyFireImage;
     public Image PropertyImage;
 
+    public GameObject MyGoldscroll;
+    public GameObject  MyTreeScroll;
+    public GameObject MyWaterScroll;
+    public GameObject MyFireScroll;
+    public GameObject MyScroll;
+
+    public Image MyGoldmage;
+    public Image MyTreeImage;
+    public Image MyWaterImage;
+    public Image MyFireImage;
+    public Image MyImage;
+
+
     public Sprite PropertyChecked;
     public Sprite PropertyUnchecked;
 
     public GameObject Propertybtnlist;
+    public GameObject myBtnlist;
     void Start()
     {
         GemBtn.onClick.AddListener(gemclick);
@@ -61,90 +81,154 @@ public class ShopScroll : MonoBehaviour
     PropertyWaterBtn.onClick.AddListener(PropertyWaterClick);
     PropertyFireBtn.onClick.AddListener(PropertyFireClick);
     PropertySoilBtn.onClick.AddListener(PropertySoilClick);
+
+       MyGoldBtn.onClick.AddListener(MYGoldClick);
+        MyTreeBtn.onClick.AddListener(MyTreeClick);
+        MyWaterBtn.onClick.AddListener(MyWaterClick);
+        MyFireBtn.onClick.AddListener(MyFireClick);
+        MySoilBtn.onClick.AddListener(MySoilClick);
     }
 
     void gemclick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         gemmage.sprite = Checked;
         Propertybtnlist.gameObject.SetActive(false);
+        myBtnlist.gameObject.SetActive(false);
         Gemscroll.gameObject.SetActive(true);
     }
 
     void oreclick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         oreImage.sprite = Checked;
         Propertybtnlist.gameObject.SetActive(false);
+        myBtnlist.gameObject.SetActive(false);
         OreScroll.gameObject.SetActive(true);
     }
 
     void lingpaiClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         lingpaiImage.sprite = Checked;
         Propertybtnlist.gameObject.SetActive(false);
+        myBtnlist.gameObject.SetActive(false);
         lingpaiScroll.gameObject.SetActive(true);
     }
 
     void mengyaoClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         mengyaoImage.sprite = Checked;
         Propertybtnlist.gameObject.SetActive(false);
+        myBtnlist.gameObject.SetActive(true);
         MengyaoScroll.gameObject.SetActive(true);
     }
 
     void skinClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         skinImage.sprite = Checked;
         SkinScroll.gameObject.SetActive(true);
+        myBtnlist.gameObject.SetActive(false);
         Propertybtnlist.gameObject.SetActive(true);
     }
 
     void PropertyGoldClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         PropertyGoldmage.sprite = PropertyChecked;
         PropertyGoldscroll.gameObject.SetActive(true);
     }
 
     void PropertyTreeClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         PropertyTreeImage.sprite = PropertyChecked;
         PropertyTreeScroll.gameObject.SetActive(true);
     }
     void PropertyWaterClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         PropertyWaterImage.sprite = PropertyChecked;
         PropertyWaterScroll.gameObject.SetActive(true);
     }
     void PropertyFireClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         PropertyFireImage.sprite = PropertyChecked;
         PropertyFireScroll.gameObject.SetActive(true);
     }
     void PropertySoilClick()
     {
-        HideScroll();
+        HidePropertyScroll();
         PropertySoilHideScroll();
+        HideMyScroll();
         PropertyImage.sprite = PropertyChecked;
         PropertyScroll.gameObject.SetActive(true);
     }
 
+    void MYGoldClick()
+    {
+        HidePropertyScroll();
+        PropertySoilHideScroll();
+        HideMyScroll();
+        MyGoldmage.sprite = PropertyChecked;
+        MyGoldscroll.gameObject.SetActive(true);
+    }
+
+    void MyTreeClick()
+    {
+        HidePropertyScroll();
+        PropertySoilHideScroll();
+        HideMyScroll();
+        MyTreeImage.sprite = PropertyChecked;
+        MyTreeScroll.gameObject.SetActive(true);
+    }
+    void MyWaterClick()
+    {
+        HidePropertyScroll();
+        PropertySoilHideScroll();
+        HideMyScroll();
+        MyWaterImage.sprite = PropertyChecked;
+        MyWaterScroll.gameObject.SetActive(true);
+    }
+    void MyFireClick()
+    {
+        HidePropertyScroll();
+        PropertySoilHideScroll();
+        HideMyScroll();
+        MyFireImage.sprite = PropertyChecked;
+        MyFireScroll.gameObject.SetActive(true);
+    }
+    void MySoilClick()
+    {
+        HidePropertyScroll();
+        PropertySoilHideScroll();
+        HideMyScroll();
+        MyImage.sprite = PropertyChecked;
+        MyScroll.gameObject.SetActive(true);
+    }
+
+
     void PropertySoilHideScroll()
     {
         PropertyGoldscroll.gameObject.SetActive(false);
@@ -153,15 +237,15 @@ public class ShopScroll : MonoBehaviour
         PropertyFireScroll.gameObject.SetActive(false);
         PropertyScroll.gameObject.SetActive(false);
 
-          gemmage.sprite = Unchecked;
+        PropertyGoldmage.sprite = PropertyUnchecked;
-          oreImage.sprite = Unchecked;
+        PropertyTreeImage.sprite = PropertyUnchecked;
-          lingpaiImage.sprite = Unchecked;
+        PropertyWaterImage.sprite = PropertyUnchecked;
-          mengyaoImage.sprite = Unchecked;
+        PropertyFireImage.sprite = PropertyUnchecked;
-          skinImage.sprite = Unchecked;
+        PropertyImage.sprite = PropertyUnchecked;
     }
 
 
-    void HideScroll()
+    void HidePropertyScroll()
     {
         Gemscroll.gameObject.SetActive(false);
         OreScroll.gameObject.SetActive(false);
@@ -169,13 +253,30 @@ public class ShopScroll : MonoBehaviour
         MengyaoScroll.gameObject.SetActive(false);
         SkinScroll.gameObject.SetActive(false);
 
+        gemmage.sprite = Unchecked;
+        oreImage.sprite = Unchecked;
+        lingpaiImage.sprite = Unchecked;
+        mengyaoImage.sprite = Unchecked;
+        skinImage.sprite = Unchecked;
 
-        PropertyGoldmage.sprite = PropertyUnchecked;
-        PropertyTreeImage.sprite = PropertyUnchecked;
-        PropertyWaterImage.sprite = PropertyUnchecked;
-        PropertyFireImage.sprite = PropertyUnchecked;
-        PropertyImage.sprite = PropertyUnchecked;
     }
+
+    void HideMyScroll()
+    {
+        MyGoldscroll.gameObject.SetActive(false);
+        MyTreeScroll.gameObject.SetActive(false);
+        MyWaterScroll.gameObject.SetActive(false);
+        MyFireScroll.gameObject.SetActive(false);
+        MyScroll.gameObject.SetActive(false);
+
+        MyGoldmage.sprite = PropertyUnchecked;
+        MyTreeImage.sprite = PropertyUnchecked;
+        MyFireImage.sprite = PropertyUnchecked;
+        MyWaterImage.sprite = PropertyUnchecked;
+        MyImage.sprite = PropertyUnchecked;
+
+    }
+
         // Update is called once per frame
         void Update()
     {

meng_yao/Assets/script/scene_Main/ui/TransferPanel.cs

@@ -10,7 +10,9 @@ public class TransferPanel : MonoBehaviour
     public Button SureBtn;
     public Button CancelBtn;
     public Button sendBtn;
+    public Text sendtext;
 
+    bool isSecond = true;
     void Start()
     {
         closeBtn.onClick.AddListener(CloseClick);
@@ -23,8 +25,10 @@ public class TransferPanel : MonoBehaviour
     {
         PlayerInfoData data = await Scene_main_jiekou.instance.PlayerInfos();
         SendCodeResponse response = await Scene_main_jiekou.instance.SendCodess(data.account,4);
-        if (response.code == 200)
+        if (response.code == 200 && isSecond)
         {
+            isSecond = false;
+            StartCoroutine(StartCountdown(sendtext, 60f));
             Promptmgr.Instance.PromptBubble(response.message);
         }
         else
@@ -53,8 +57,19 @@ public class TransferPanel : MonoBehaviour
       
     }
     // Update is called once per frame
-    void Update()
+    IEnumerator StartCountdown(Text textComponent, float duration)
     {
-        
+        float timeLeft = duration;
+
+        while (timeLeft > 0)
+        {
+            textComponent.text = Mathf.Ceil(timeLeft).ToString(); // 更新Text组件的显示
+            timeLeft -= 1f; // 每秒减少1秒
+            yield return new WaitForSeconds(1f); // 等待1秒
+            Debug.Log("进入倒计时");
+        }
+        isSecond = true;
+     
+        textComponent.text = "发送"; // 倒计时结束后更新文本
     }
 }

meng_yao/Assets/script/scene_loading/Logo_in.cs

@@ -97,13 +97,16 @@ public class Logo_in : mount
         boxTypes.Add(new BoxType {Name = "submit", textName = " 取消确定 ", Type = 12 });
         GameObject gameObject = add_pop_up(true);//生成弹窗母体
         List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "用户协议和隐私保护指引");//测试输入框回调处理
+        Text awaittime = gameObjects[1].transform.Find("Surnbtn/suretxt").GetComponent<Text>();
+        StartCoroutine(StartCountdown(awaittime,5f,0)); 
+        isSecond = false;
         gameObjects[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//登录确定或取消
         {
             if (type == 0)
             {
                 Application.Quit();
             }
-            else if (type == 1)
+            else if (type == 1 && isSecond)
             {
                 login_in_screen();//跳转到登录界面
                 gameObject.GetComponent<input_box_pop_up_window>().destroy();
@@ -167,7 +170,7 @@ public class Logo_in : mount
                     {
                         regiestisSecond = false;
                         Text time = gameObjects[3].transform.Find("ConfirmBtn/Confirmtext").GetComponent<Text>();
-                        StartCoroutine(StartCountdown(time, 60f));
+                        StartCoroutine(StartCountdown(time, 60f,1));
                         Promptmgr.Instance.PromptBubble(response.message);
                     }
                     else
@@ -278,7 +281,7 @@ public class Logo_in : mount
                 {
                     isSecond = false;
                     Text time = gameObjects[1].transform.Find("ConfirmBtn/Confirmtext").GetComponent<Text>();
-                    StartCoroutine(StartCountdown(time, 60f));
+                    StartCoroutine(StartCountdown(time, 60f,1));
                     Promptmgr.Instance.PromptBubble(response.message);
                 }
                 else
@@ -343,7 +346,7 @@ public class Logo_in : mount
     }
 
 
-    IEnumerator StartCountdown(Text textComponent, float duration)
+    IEnumerator StartCountdown(Text textComponent, float duration,int i)
     {
         float timeLeft = duration;
 
@@ -356,10 +359,19 @@ public class Logo_in : mount
         }
         isSecond = true;
         regiestisSecond = true;
-        textComponent.text = "发送"; // 倒计时结束后更新文本
+        if (i == 1)
+        {
+            textComponent.text = "发送"; // 倒计时结束后更新文本
+        }
+        else
+        {
+            textComponent.text = "同意";
+        }
+      
     }
 
 
+
     IEnumerator jiaLoading()
     {
             while (timer <= 3f)

meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs

@@ -20,9 +20,10 @@ public class treeFansList : MonoBehaviour
             { "client-info", "{\"platform\":\"ios\",\"phone_product\":\"apple\",\"phone_model\":\"iPhone_8\",\"system_version\":\"12.0\",\"screen_size\":\"750*1334\",\"device_no\":\"e3e277810fff9d955ebdd7037eff51a8\",\"version\":\"1.0.0\"}" }
         };
     }
-    public async Task<TreeFansListResponse> TreeFansList()
+    public async Task<TreeFansListResponse> TreeFansList(string keyword =null)
     {
-        string response = await myWeb.SendRequest(myWeb.URL + "/api/tree/team_fans_list", "GET", "{}", CreateHeaders());
+        string response = await myWeb.SendRequest(myWeb.URL + "/api/tree/team_fans_list?page_num=1&page_size=10&keyword="+keyword, "GET", "{}", CreateHeaders());
+        Debug.Log("¹Ø¼ü´Ê"+keyword);
         Debug.Log("Éú̬Ê÷ÍŶӷÛË¿Áбí" + response);
         TreeFansListResponse treeFansListResponse = JsonConvert.DeserializeObject<TreeFansListResponse>(response);
         Debug.Log(treeFansListResponse.Data.Pages.total_count + "=====================");