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

合并钓手
宠物成就信息接口的完成
2025-01-07 17:53:55 +08:00 · 2025-01-07 17:53:43 +08:00 · 2025-01-07 17:28:25 +08:00
14 changed files with 13103 additions and 5388 deletions
--- a/meng_yao/Assets/Resources/Prefabs/The_best_fisherman.prefab
+++ b/meng_yao/Assets/Resources/Prefabs/The_best_fisherman.prefab
--- a/meng_yao/Assets/Resources/Prefabs/The_best_fisherman.prefab.meta
+++ b/meng_yao/Assets/Resources/Prefabs/The_best_fisherman.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 01e4991408e23c040a7e3e66c2b739b4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/meng_yao/Assets/Resources/Prefabs/YUpanel.prefab
+++ b/meng_yao/Assets/Resources/Prefabs/YUpanel.prefab
@ -0,0 +1,449 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2026669773227422948
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2026669773227422949}
+  - component: {fileID: 2026669773227422955}
+  - component: {fileID: 2026669773227422954}
+  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 &2026669773227422949
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773227422948}
+  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: 2026669774141083934}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 458.6698, y: 76.3482}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2026669773227422955
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773227422948}
+  m_CullTransparentMesh: 1
+--- !u!114 &2026669773227422954
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773227422948}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u606D\u559C\u4F60\u8C03\u5230\u9C7C"
+--- !u!1 &2026669773451064360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2026669773451064361}
+  - component: {fileID: 2026669773451064364}
+  - component: {fileID: 2026669773451064367}
+  - component: {fileID: 2026669773451064366}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2026669773451064361
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773451064360}
+  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: 2026669773643422136}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2026669773451064364
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773451064360}
+  m_CullTransparentMesh: 1
+--- !u!114 &2026669773451064367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773451064360}
+  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: c31814b8c719a96418204b01b12f8c0f, 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!114 &2026669773451064366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773451064360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2026669773451064367}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2026669773643422139}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &2026669773643422139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2026669773643422136}
+  m_Layer: 5
+  m_Name: YUpanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2026669773643422136
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773643422139}
+  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: 2026669773451064361}
+  - {fileID: 2026669774141083934}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2026669773761961588
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2026669773761961589}
+  - component: {fileID: 2026669773761961595}
+  - component: {fileID: 2026669773761961594}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2026669773761961589
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773761961588}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.4597, y: 1.4597, z: 1.4597}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2026669774141083934}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2026669773761961595
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773761961588}
+  m_CullTransparentMesh: 1
+--- !u!114 &2026669773761961594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669773761961588}
+  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: 8e70c2d23da12dc459af093569e40dba, 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 &2026669774141083929
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2026669774141083934}
+  - component: {fileID: 2026669774141083939}
+  - component: {fileID: 2026669774141083938}
+  - component: {fileID: 2026669774141083933}
+  - component: {fileID: 2026669774141083932}
+  m_Layer: 5
+  m_Name: Setting
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2026669774141083934
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669774141083929}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2026669773227422949}
+  - {fileID: 2026669773761961589}
+  m_Father: {fileID: 2026669773643422136}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 220}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2026669774141083939
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669774141083929}
+  m_CullTransparentMesh: 1
+--- !u!114 &2026669774141083938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669774141083929}
+  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: c3e6012b5e1cc6e4187dc71c0ca2e074, 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!114 &2026669774141083933
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669774141083929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &2026669774141083932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2026669774141083929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 181
+  m_ChildAlignment: 4
+  m_Spacing: 6.01
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
--- a/meng_yao/Assets/Resources/Prefabs/YUpanel.prefab.meta
+++ b/meng_yao/Assets/Resources/Prefabs/YUpanel.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5da450fc4ddddf04b823ad4e466d18fb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
--- a/meng_yao/Assets/animation/lagandi.controller
+++ b/meng_yao/Assets/animation/lagandi.controller
@ -59,7 +59,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -5631853196050844921}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 260, y: 150, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
--- a/meng_yao/Assets/res/eco_tree_achievement/bg_treechaive.png
+++ b/meng_yao/Assets/res/eco_tree_achievement/bg_treechaive.png
--- a/meng_yao/Assets/res/eco_tree_achievement/bg_treechaive.png.meta
+++ b/meng_yao/Assets/res/eco_tree_achievement/bg_treechaive.png.meta
@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 3db4e336af2a6b44fbaf161e1ee8eb2f
+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: 
--- a/meng_yao/Assets/script/TanChuang/Lottery.cs
+++ b/meng_yao/Assets/script/TanChuang/Lottery.cs
@ -24,6 +24,7 @@ public class Lottery : MonoBehaviour
    {
        TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
        WaterText.text = info.Data.Water.ToString();
+        Update_itemClick();
    }


@ -31,7 +32,6 @@ public class Lottery : MonoBehaviour
    {
        LotteryBtn.onClick.AddListener(LotteryClick);
        ClosefightingBtn.onClick.AddListener(CloseBtnClick);
-        Update_itemClick();

    }

@ -58,7 +58,6 @@ 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);
@ -98,6 +97,11 @@ public class Lottery : MonoBehaviour
            }
            objitem.Clear();
            fightinglist.Clear();
+            foreach (GameObject obj in ExuExhibitmusklist)
+            {
+                Destroy(obj);
+            }
+            ExuExhibitmusklist.Clear();
            Update_itemClick();
            TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
            WaterText.text = info.Data.Water.ToString();
@ -108,9 +112,22 @@ public class Lottery : MonoBehaviour
        {
            Promptmgr.Instance.PromptBubble("Ë®µÎÓà¶î²»×ã");
        }
-     
    }

+    private void OnDisable()
+    {
+        foreach (GameObject ob in objitem)
+        {
+            Destroy(ob);
+        }
+        objitem.Clear();
+        foreach (GameObject obj in ExuExhibitmusklist)
+        {
+            Destroy(obj);
+        }
+        ExuExhibitmusklist.Clear();
+        fightinglist.Clear();
+    }
    // Update is called once per frame
    void Update()
    {
--- a/meng_yao/Assets/script/scene_Main/Promotion_Rank.cs
+++ b/meng_yao/Assets/script/scene_Main/Promotion_Rank.cs
@ -133,9 +133,6 @@ public class Promotion_Rank : MonoBehaviour

    }

-
-
-
    private void Update()
    {
        if (Time.time - lastCallTime >= interval)
--- a/meng_yao/Assets/script/scene_Main/ui/TransfersurenPanel.cs
+++ b/meng_yao/Assets/script/scene_Main/ui/TransfersurenPanel.cs
@ -32,6 +32,7 @@ public class TransfersurenPanel : MonoBehaviour
            WaterPanel.instance.Updated_petinfo(petinfo);
            Destroy(this.gameObject);
            Promptmgr.Instance.PromptBubble(response.message);
+
        }
        else
        {
--- a/meng_yao/Assets/script/scene_Main/ui/treeachievePanel.cs
+++ b/meng_yao/Assets/script/scene_Main/ui/treeachievePanel.cs
@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using UnityEngine;

 public class treeachievePanel : MonoBehaviour
@ -13,7 +12,10 @@ public class treeachievePanel : MonoBehaviour
    public List<Sprite> sxcardbg;
    public List<Sprite> sxcardup;

+    int prizeNumber=0;
+
    List<GameObject> itemlist = new List<GameObject>();
+
    private async void OnEnable()
    {
        treeachievementResponse response = await Scene_main_jiekou.instance.Treeachievements();
@ -30,11 +32,32 @@ public class treeachievePanel : MonoBehaviour
            if (response.data.top_list[j].expired_time == 0)
            {
                GameObject obj = Instantiate(sxcardobj, sxcardConnact);
+                itemlist.Add(obj);
+                SwitchCardbg(response.data.top_list[j].type,obj);
                obj.GetComponent<sxcarditem>().name.text = response.data.top_list[j].name;
            }
            else
-            { 
-            
+            {
+                prizeobj[prizeNumber].gameObject.SetActive(true);
+                Debug.Log("分红类型"+response.data.top_list[j].type);
+                switch (response.data.top_list[j].type)
+                {
+                    case 0:
+                        prizeobj[prizeNumber].GetComponent<treeachievePrize>().reward.sprite = sxcard[12];
+                        Debug.Log("游戏分红卡");
+                        break;
+                        case 1:
+                        prizeobj[prizeNumber].GetComponent<treeachievePrize>().reward.sprite = sxcard[13];
+                        Debug.Log("广告分红卡");
+                        break;
+                    case 2:
+                        prizeobj[prizeNumber].GetComponent<treeachievePrize>().reward.sprite = sxcard[14];
+                        Debug.Log("金币分红卡");
+                        break;
+                }
+                prizeobj[prizeNumber].GetComponent<treeachievePrize>().Remainingtime = response.data.top_list[j].expired_time;
+                prizeobj[prizeNumber].GetComponent<treeachievePrize>().Updatatime();
+                prizeNumber++;
            }


@ -67,8 +90,12 @@ public class treeachievePanel : MonoBehaviour
    
    }

+  
+
+
    private void OnDisable()
    {
+        prizeNumber = 0;
        foreach (GameObject obj in itemlist)
        { 
         Destroy(obj);
--- a/meng_yao/Assets/script/scene_Main/ui/treeachievePrize.cs
+++ b/meng_yao/Assets/script/scene_Main/ui/treeachievePrize.cs
@ -0,0 +1,56 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class treeachievePrize : MonoBehaviour
+{
+    public Image reward;
+    public Text time;
+
+    public float Remainingtime;
+    private float lastCallTime = 0f;
+    private float interval = 1f; // 每秒调用一次
+
+    //float remainingTime = 0f;
+    void Start()
+    {
+     
+    }
+
+    public void Updatatime()
+    {
+      
+        UpdateCountdownText(Remainingtime);
+    }
+
+    void UpdateCountdownText(float remainingTimes)
+    {
+     
+        // 将剩余时间转换为小时、分钟和秒
+        int hours = Mathf.FloorToInt(remainingTimes / 3600);
+        int minutes = Mathf.FloorToInt((remainingTimes % 3600) / 60);
+        int seconds = Mathf.FloorToInt(remainingTimes % 60);
+
+        // 使用格式化字符串显示倒计时（00:00:00）
+        time.text = string.Format("{0:D2}:{1:D2}:{2:D2}", hours, minutes, seconds);
+        Debug.Log(time.text);
+
+    }
+
+    private void Update()
+    {
+        if (Time.time - lastCallTime >= interval)
+        {
+            // 每秒调用一次的代码
+            if (Remainingtime > 0)
+            {
+                Remainingtime -= 1;
+                UpdateCountdownText(Remainingtime);
+                Debug.Log("进入倒计时");
+            }
+
+            // 更新上次调用时间
+            lastCallTime = Time.time;
+        }
+    }
+}
--- a/meng_yao/Assets/script/scene_Main/ui/treeachievePrize.cs.meta
+++ b/meng_yao/Assets/script/scene_Main/ui/treeachievePrize.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d116c3aa369351f43bb27a8bcb029a7f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant:
Author	SHA1	Message	Date
liuliang	d6ee7ab9be	Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks	2025-01-07 17:53:55 +08:00
liuliang	6109c2db56	合并钓手	2025-01-07 17:53:43 +08:00
liuliang	01377e0f18	宠物成就信息接口的完成	2025-01-07 17:28:25 +08:00