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

meng_yao/Assets/Resources/Prefabs/Manure.prefab

@@ -91,6 +91,8 @@ GameObject:
   - component: {fileID: 2221188759535589542}
   - component: {fileID: 2221188759535589540}
   - component: {fileID: 2221188759535589543}
+  - component: {fileID: 2193857130921679681}
+  - component: {fileID: 1752792709884921916}
   m_Layer: 5
   m_Name: Manure
   m_TagString: Untagged
@@ -157,3 +159,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2193857130921679681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2221188759535589545}
+  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: 2221188759535589543}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1752792709884921916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2221188759535589545}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 018ab78da6764ff4f835c0fd47ad523c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DropBtn: {fileID: 0}
+  targetPosition: {fileID: 0}
+  flyDuration: 1

meng_yao/Assets/res/the_main_interface_of_the_eco_tree_at_night_slices/img_treeicn night01.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
+    wrapU: 1
-    wrapV: 0
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -89,13 +89,25 @@ TextureImporter:
     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: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

meng_yao/Assets/res/the_main_interface_of_the_eco_tree_at_night_slices/img_treenight.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
+    wrapU: 1
-    wrapV: 0
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -89,13 +89,25 @@ TextureImporter:
     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: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

meng_yao/Assets/res/the_main_interface_of_the_eco_tree_is_during_the_day_slices/icn_gameintro.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: c165058eb9d7ba1458ea801c23c8fc3e
+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/Panel/eco_tree/WaterPanel.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -7,6 +9,9 @@ public class WaterPanel : MonoBehaviour
 {
     public static WaterPanel instance;
     public Text waterCountText;
+    public RawImage TreeBg;
+    public Texture DaytimeSp;
+    public Texture NightSp;
 
 
     public Text chart_title;
@@ -33,6 +38,28 @@ public class WaterPanel : MonoBehaviour
     public Button feedBtn;
     public GameObject Pet;
 
+    private void OnEnable()
+    {
+        
+
+        DateTime currentTime = DateTime.Now;
+
+        // »ñȡСʱ¡¢·ÖÖÓºÍÃë
+        int hours = currentTime.Hour;
+        int minutes = currentTime.Minute;
+        int seconds = currentTime.Second;
+
+        if (hours >= 20)
+        {
+            TreeBg.texture = NightSp;
+        }
+        else
+        {
+            TreeBg.texture = DaytimeSp;
+        }
+
+    }
+
     // Start is called before the first frame update
     async  void Start()
     {

meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs

@@ -44,7 +44,18 @@ public class BaoshiRoomcontroller : MonoBehaviour
 
     [Header("显示精灵数量")]
     public Text shipNumberTextPro;
+    public int shipNumber;
+    public int MaxShipNumber=10;
 
+    public int ShipNumber
+    {
+        get=> shipNumber;
+        set
+        {
+            shipNumber=value;
+            shipNumberTextPro.text = shipNumber.ToString()+"/"+MaxShipNumber.ToString();
+        }
+    }
 
     [Header("点击的特效")]
     public GameObject effectPrefab;//特效
@@ -61,14 +72,14 @@ public class BaoshiRoomcontroller : MonoBehaviour
 
     public List<string> ids = new List<string>();
 
-    public int number;
+   
 
     public GameObject musk;
     // Start is called before the first frame update    
     private void Awake()
     {
         listItem = new List<VoucherItem>();
-        UpdateShipNumberTextPro(listItem.Count.ToString());
+       // UpdateShipNumberTextPro(listItem.Count.ToString());
     }
     private void Start()
     {
@@ -152,28 +163,13 @@ public class BaoshiRoomcontroller : MonoBehaviour
             return;
         }
         musk.gameObject.SetActive(false);
-        number++;
+        //number++;
-        UpdateShipNumberTextPro(number + "/10");
+        //UpdateShipNumberTextPro(number + "/10");
         fishMan = GameObject.Instantiate(fishManPrefab, this.transform);
         fishMan.transform.position = startPos.position;
         fishManShipContorl = fishMan.GetComponent<minerControl>();
         fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);
     }
- 
-
-
-    //更新精灵数量显示
-    public void UpdateShipNumberTextPro(string str)
-    {
-        if (shipNumberTextPro.text == str)
-        {
-            return;
-        }
-        shipNumberTextPro.text = str;
-
-    }
-
-
     //使用代金卷
     async void UseShip()
     {
@@ -195,7 +191,6 @@ public class BaoshiRoomcontroller : MonoBehaviour
     public async Task<bool> ActivationRoom()
     {
        return await miner_jiekou.instance.MiningActivate(this.RoomId);
-
     }
 
 }

meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs

@@ -21,6 +21,8 @@ public class Scene_main_jiekou :MonoBehaviour
     petAdopt petAdopt = new petAdopt();
     petBettles petBettles = new petBettles();
     promotionRank promotionRank = new promotionRank();
+    treeGetWater treeGetWater = new treeGetWater();
+
     public static Scene_main_jiekou instance;
 
     //public PlayerInfoData infoData;
@@ -51,7 +53,7 @@ public class Scene_main_jiekou :MonoBehaviour
         playerInfo playerInfo=new playerInfo();
        PlayerIndfo _PlayerIndfo = await playerInfo.PalyerInfo();
        return _PlayerIndfo.Data;
-   }
+   }//获取用户详情
 
    public async Task<TreeInfo> TreeInfoS()//Éú̬Ê÷ÐÅÏ¢
    {
@@ -71,7 +73,7 @@ public class Scene_main_jiekou :MonoBehaviour
     {
         treeGetWaterBody body = new treeGetWaterBody();
         body.index = index;
-        body.transId = transId;
+        body.trans_id = transId;
         bool isSuccefful = await getWater.TreeGetWater(body);
         return isSuccefful;
     }
@@ -128,27 +130,29 @@ public class Scene_main_jiekou :MonoBehaviour
     public async Task<petBettleInfoResponse> getPetBettleInfos()
     {
         return await petbettle.getPetBettleInfo();
-    }
+    }//宠物出战信息
 
-    public async Task<FeedPetResponse> feedpets()
+    public async Task<FeedPetResponse> feedpets()//宠物喂养
     {
         return await feedPet.feedpet();
     }
 
-    public async Task<PetAdoptResponse> PetAdopts()
+    public async Task<PetAdoptResponse> PetAdopts()//宠物领养
     {
         return await petAdopt.PetAdopt();
     }
 
-    public async Task<bool> PetBettless(int id)//³èÎïid
+    public async Task<bool> PetBettless(int id)//宠物出战
     {
        return  await petBettles.PetBettles(id);
     }
 
-    public async Task<PromotionRankResponse> PromotionRanks()
+    public async Task<PromotionRankResponse> PromotionRanks()//拉新排行榜
     {
         return await promotionRank.PromotionRank();
     }
 
 
+
+
     }

meng_yao/Assets/script/scene_Main/Tree_team.cs

@@ -5,8 +5,8 @@ using UnityEngine.UI;
 
 public class Tree_team : MonoBehaviour
 {
-    public Text DirectPushNum;
+    public Text DirectPushNum;//直推
-    public Text PushNum;
+    public Text PushNum;//间推
     public Image DirectPushFill;
     public Image PushFill;
 
@@ -20,14 +20,14 @@ public class Tree_team : MonoBehaviour
     async void Start()
     {
         TreeTeam info= await Scene_main_jiekou.instance.TreeTeamDatas();
-        TeammateCount.text = info.Data.Info.TeamCount+"/10";
+        TeammateCount.text = info.Data.Info.team_count+"/10";
         TeamName.text = info.Data.Info.Nickname;
         TeamId.text = info.Data.Info.Uid;
-        TeamCount.text = "ÍŶÓÈËÊý:"+info.Data.Info.TeamCount;
+        TeamCount.text = "团队人数:"+info.Data.Info.team_count;
-        DirectPushNum.text = info.Data.Items[0].NowVal+"/" + info.Data.Items[0].ReqVal;
+        DirectPushNum.text = info.Data.Info.directly_count + "/" + info.Data.Items[0].req_val;
         DirectPushFill.fillAmount = info.Data.Items[0].Percentage;
-        PushNum.text = info.Data.Items[0].NowVal + "/" + info.Data.Items[0].ReqVal;
+        PushNum.text = info.Data.Items[1].now_val + "/" + info.Data.Items[0].req_val;
-        PushFill.fillAmount = info.Data.Items[0].Percentage;
+        PushFill.fillAmount = info.Data.Items[1].Percentage;
 
 
         Init();
@@ -38,12 +38,12 @@ public class Tree_team : MonoBehaviour
         TreeFansListResponse response = await Scene_main_jiekou.instance.TreeFansListS();
         Debug.Log(response);
 
-       for (int i=0;i< response.Data.Pages.TotalCount; i++)
+       for (int i=0;i< response.Data.Pages.total_count; i++)
         {
             GameObject obj = GameObject.Instantiate(item,parent);
             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].TeamCount;
+            obj.GetComponent<Tree_team_item>().itemTeamCount.text ="团队人数"+ response.Data.List[i].team_count;
 
         }
     }

meng_yao/Assets/script/scene_Main/WaterDrop.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using DG.Tweening;
+public class WaterDrop : MonoBehaviour
+{
+
+    public Button DropBtn;
+    public Transform targetPosition; // Ä¿±êλÖÃ
+    public float flyDuration = 1f;   // ·ÉÐгÖÐøʱ¼ä
+    public int id;
+
+
+    void Start()
+    {
+        DropBtn =GetComponent<Button>();
+        DropBtn.onClick.AddListener(DropClick);
+    }
+
+    async void DropClick()
+    {
+        bool succefful = await Scene_main_jiekou.instance.TreeGetWaters(id, "string");
+
+        if (succefful)
+        {
+            transform.DOMove(targetPosition.position, flyDuration)
+                .OnComplete(() =>
+                    Destroy(this.gameObject)
+                );
+        }
+       
+     
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/WaterDrop.cs.meta

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

meng_yao/Assets/script/scene_Main/scene/Scene_baoshidao.cs

@@ -33,7 +33,8 @@ public class Scene_baoshidao : MonoBehaviour
             go.ActivateValue = info.price;
             go.goldNumerTextPro.text = info.price.ToString("f0");
 
-            go.shipNumberTextPro.text = info.activate_count.ToString() + "/" + info.activate_limit;
+            go.MaxShipNumber = info.activate_limit;
+            go.ShipNumber = info.activate_count;
 
             if (info.activate_count > 0)
             {

meng_yao/Assets/script/scene_Main/scene/Scene_baoshikuang.cs

@@ -27,18 +27,19 @@ public class Scene_baoshikuang : MonoBehaviour
         int index = 0;
         foreach (MinngConfigData info in infos)
         {
-            BaoshiRoomcontroller roomController = lands[index].GetComponent<BaoshiRoomcontroller>();
+            BaoshiRoomcontroller go = lands[index].GetComponent<BaoshiRoomcontroller>();
 
-           
+            go.RoomId = info.id;
-            roomController.RoomId = info.id;
+            //info.activate_count
-            roomController.shipNumberTextPro.text = info.activate_count.ToString() + "/" + info.activate_limit;
+            //info.activate_limit
+            go.MaxShipNumber = info.activate_limit;
+            go.ShipNumber = info.activate_count;
 
             if (info.activate_count > 0)
             {
                 for (int temp = 0; temp < info.activate_count; temp++) 
                 {
-                    
+                    go.add_fish("1");
-                    roomController.add_fish("1");
                     await Task.Delay(100);
                 }
             }

meng_yao/Assets/script/scene_Main/scene/Scene_jinbikuang.cs

@@ -29,7 +29,9 @@ public class Scene_jinbikuang : MonoBehaviour
             roomcontroller go = lands[index].GetComponent<roomcontroller>();
             go.RoomId = info.id;
             go.ActivateValue = info.price;
-            go.shipNumberTextPro.text = info.activate_count.ToString() + "/" + info.activate_limit;
+
+            go.MaxShipNumber = info.activate_limit;
+            go.ShipNumber = info.activate_count;
 
             if (info.activate_count > 0)
             {

meng_yao/Assets/script/scene_Main/scene/scene_jingshadao.cs

@@ -32,18 +32,18 @@ public class scene_jingshadao : MonoBehaviour
 
             go.ActivateValue = info.price;
             go.goldNumerTextPro.text = info.price.ToString("f0");
-            go.shipNumberTextPro.text =info.activate_count.ToString() + "/" + info.activate_limit;
+
+            go.MaxShipNumber = info.activate_limit;
+            go.ShipNumber = info.activate_count;
 
             if (info.activate_count > 0)
             {
                 for (int temp = 0; temp < info.activate_count; temp++)
                 {
-
                     go.add_fish("1");
                     await Task.Delay(100);
                 }
             }
-
             index++;
         }
     }

meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs

@@ -50,7 +50,18 @@ public class baoshidao_contorl : MonoBehaviour
     public Text goldNumerTextPro;
     [Header("显示船只数量")]
     public Text shipNumberTextPro;
+    public int shipNumber;
+    public int MaxShipNumber = 10;
 
+    public int ShipNumber
+    {
+        get => shipNumber;
+        set
+        {
+            shipNumber = value;
+            shipNumberTextPro.text = shipNumber.ToString() + "/" + MaxShipNumber.ToString();
+        }
+    }
 
     [Header("点击的高亮图层")]
     public GameObject HightLight;//高亮图层
@@ -89,53 +100,6 @@ public class baoshidao_contorl : MonoBehaviour
         goldNumerTextPro.text = ActivateValue.ToString();
     }
 
-
-
-
-    async void addman(int type, int number)
-    {
-        if (type == this.type)
-        {
-            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);
-            Debug.Log(itemList.Ids[0]);
-            if (itemList.ErrorCode == 0) // 如果购买成功
-            {
-                Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);
-
-                /* foreach (string item in itemList.Ids)
-                 {
-                     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.blue);
-                         //增加船只数量
-                         //ChangeShipNumber(1);
-
-
-                     }
-                     else
-                     {
-                         Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-                     }
-                 }*/
-
-            }
-            else// 如果购买失败
-            {
-                Res res = JsonUtility.FromJson<ids>(userponse);
-                Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-            }
-        }
-    }
-
     public async void OnClick()
     {
 

meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs

@@ -57,7 +57,6 @@ public class jskPanel : mount
                 {
 
                     lands[0].GetComponent<roomcontroller>().add_fish();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -200);
                  
                 }
             }
@@ -70,9 +69,7 @@ public class jskPanel : mount
                 if (!Generate1 && (PlayerManager.Instance.Coins - 400) > 0)
                 {
 
-                    lands[1].GetComponent<roomcontroller>().add_fish();
+                    lands[1].GetComponent<roomcontroller>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -400);
-
                 }
             }
 
@@ -83,8 +80,7 @@ public class jskPanel : mount
             {
                 if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0)
                 {
-                    lands[2].GetComponent<roomcontroller>().add_fish();
+                    lands[2].GetComponent<roomcontroller>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -600);
                     
                 }
             }
@@ -96,9 +92,7 @@ public class jskPanel : mount
             {
                 if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0)
                 {
-                    lands[3].GetComponent<roomcontroller>().add_fish();
+                    lands[3].GetComponent<roomcontroller>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -600);
-
                 }
             }
 
@@ -109,9 +103,7 @@ public class jskPanel : mount
             {
                 if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0)
                 {
-                    lands[4].GetComponent<roomcontroller>().add_fish();
+                    lands[4].GetComponent<roomcontroller>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -600);
-
                 }
             }
 

meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs

@@ -49,6 +49,18 @@ public class roomcontroller : MonoBehaviour
    
     [Header("显示精灵数量")]
     public Text shipNumberTextPro;
+    public int shipNumber;
+    public int MaxShipNumber = 10;
+
+    public int ShipNumber
+    {
+        get => shipNumber;
+        set
+        {
+            shipNumber = value;
+            shipNumberTextPro.text = shipNumber.ToString() + "/" + MaxShipNumber.ToString();
+        }
+    }
 
 
     [Header("点击的特效")]
@@ -66,66 +78,19 @@ public class roomcontroller : MonoBehaviour
 
     public List<string> ids = new List<string>();
 
-    public int number;
+    //public int number;
 
     public GameObject musk;
     // Start is called before the first frame update    
     private void Awake()
     {
         listItem = new List<VoucherItem>();
-        UpdateShipNumberTextPro(listItem.Count.ToString());
-    }
-    private void Start()
-    {
-        FishPrice = 10;
-
 
     }
    
 
-    async void addman(int type, int number)
-    {
-        if (type == this.type)
-        {
-            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);
-            Debug.Log(itemList.Ids[0]);
-            if (itemList.ErrorCode == 0) // 如果购买成功
-            {
-                Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);
-
-                /* foreach (string item in itemList.Ids)
-                 {
-                     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.blue);
-                         //增加船只数量
-                         //ChangeShipNumber(1);
 
    
-                     }
-                     else
-                     {
-                         Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-                     }
-                 }*/
-
-            }
-            else// 如果购买失败
-            {
-                Res res = JsonUtility.FromJson<ids>(userponse);
-                Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-            }
-        }
-    }
 
     public async void OnClick()
     {
@@ -136,17 +101,26 @@ public class roomcontroller : MonoBehaviour
 
         if (fishMan == null)
         {
-            Promptmgr.Instance.PromptBubble("还没有买", Color.black, Color.red);
+            //Promptmgr.Instance.PromptBubble("»¹Ã»ÓÐÂò", Color.black, Color.red);
             return;
         }
+    }
 
 
+    /// <summary>
+    /// ¹ºÂò¼¤»î
+    /// </summary>
+    public async void BuyActivation()
+    {
+
         if (await ActivationRoom())
         {
-            Promptmgr.Instance.PromptBubble("激活成功");
             add_fish();
+            this.ShipNumber += 1;
         }
     }
+
+
     public async void add_fish(string timerStr = null)//生成船只
     {
         if (timerStr != null)
@@ -162,33 +136,13 @@ public class roomcontroller : MonoBehaviour
             return;
         }
         musk.gameObject.SetActive(false);
-        number++;
-        UpdateShipNumberTextPro(number + "/10");
         fishMan = GameObject.Instantiate(fishManPrefab, this.transform);
         fishMan.transform.position = startPos.position;
         fishManShipContorl = fishMan.GetComponent<minerControl>();
         fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);
     }
-
-    
-
-
-    //更新精灵数量显示
-    public void UpdateShipNumberTextPro(string str)
-    {
-        if (shipNumberTextPro.text == str)
-        {
-            return;
-        }
-        shipNumberTextPro.text = str;
-
-    }
-
-
     public async Task<bool> ActivationRoom()
     {
         return await miner_jiekou.instance.MiningActivate(this.RoomId);
-
     }
-
 }

meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs

@@ -54,8 +54,8 @@ public class jishadao_buy :mount
                 if (!Generate1 && (PlayerManager.Instance.Coins - 200) > 0)
                 {
                     
-                    lands[0].GetComponent<jishadao_contorl>().add_fish();
+                    lands[0].GetComponent<jishadao_contorl>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -200);
+                    
 
                 }
             }
@@ -68,8 +68,8 @@ public class jishadao_buy :mount
                 if (!Generate1 && (PlayerManager.Instance.Coins - 400) > 0)
                 {
                    
-                    lands[1].GetComponent<jishadao_contorl>().add_fish();
+                    lands[1].GetComponent<jishadao_contorl>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -400);
+                  
 
                 }
             }
@@ -81,8 +81,7 @@ public class jishadao_buy :mount
             {
                 if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0)
                 {
-                    lands[2].GetComponent<jishadao_contorl>().add_fish();
+                    lands[2].GetComponent<jishadao_contorl>().BuyActivation();
-                    PlayerManager.Instance.SetMoney(MoneyType.Coins, -600);
                    
                 }
             }

meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs

@@ -49,6 +49,18 @@ public class jishadao_contorl : MonoBehaviour
     public Text goldNumerTextPro;
     [Header("显示船只数量")]
     public Text shipNumberTextPro;
+    public int shipNumber;
+    public int MaxShipNumber = 10;
+
+    public int ShipNumber
+    {
+        get => shipNumber;
+        set
+        {
+            shipNumber = value;
+            shipNumberTextPro.text = shipNumber.ToString() + "/" + MaxShipNumber.ToString();
+        }
+    }
 
 
     [Header("点击的高亮图层")]
@@ -70,71 +82,17 @@ public class jishadao_contorl : MonoBehaviour
     private void Awake()
     {
         listItem = new List<VoucherItem>();
-        UpdateShipNumberTextPro(listItem.Count.ToString());
+        //UpdateShipNumberTextPro(listItem.Count.ToString());
     }
     private void Start()
     {
         FishPrice = 10;
-
-
         HightLight.SetActive(false);
-
-       
-
-
     }
     private void Update()
     {
         goldNumerTextPro.text = ActivateValue.ToString();
     }
-
-   
-  
-
-    async void addman(int type, int number)
-    {
-        if (type == this.type)
-        {
-            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);
-            Debug.Log(itemList.Ids[0]);
-            if (itemList.ErrorCode == 0) // 如果购买成功
-            {
-                Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);
-
-                /* foreach (string item in itemList.Ids)
-                 {
-                     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.blue);
-                         //增加船只数量
-                         //ChangeShipNumber(1);
-
-
-                     }
-                     else
-                     {
-                         Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-                     }
-                 }*/
-
-            }
-            else// 如果购买失败
-            {
-                Res res = JsonUtility.FromJson<ids>(userponse);
-                Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red);
-            }
-        }
-    }
-
     public async void OnClick()
     {      
 
@@ -143,37 +101,34 @@ public class jishadao_contorl : MonoBehaviour
             return;
         }
 
-
-        
-
         ScaleAni(OnBtnAni);
         
-
         if (fishMan == null)
         {
-            Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red);
+           // Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red);
             return;
         }
+    }
 
-
+    /// <summary>
-
+    /// 购买激活
+    /// </summary>
+    public async void BuyActivation()
+    {
 
         if (await ActivationRoom())
         {
-
-            ScaleAni(OnBtnAni);
             add_fish();
+            this.ShipNumber+=1;
+        }
     }
 
 
-       
-
-    }
     public async void add_fish(string timerStr = null)//生成船只
     {
         if (fishMan != null)
         {
-            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
+           // Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
            Debug.Log("更新船");
 
             return;
@@ -320,20 +275,6 @@ public class jishadao_contorl : MonoBehaviour
         }
 
     }
-
-
-    //更新船只数量显示
-    public void UpdateShipNumberTextPro(string str)
-    {
-        if (shipNumberTextPro.text == str)
-        {
-            return;
-        }
-        shipNumberTextPro.text = str;
-
-    }
-
-
     public async Task<bool> ActivationRoom()
     {
         return await miner_jiekou.instance.MiningActivate(this.RoomId);

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

@@ -25,7 +25,7 @@ public class treeFansList : MonoBehaviour
         string response = await myWeb.SendRequest(myWeb.URL + "/api/tree/team_fans_list", "GET", "{}", CreateHeaders());
         Debug.Log("Éú̬Ê÷ÍŶӷÛË¿Áбí" + response);
         TreeFansListResponse treeFansListResponse = JsonConvert.DeserializeObject<TreeFansListResponse>(response);
-        Debug.Log(treeFansListResponse.Data.Pages.TotalCount + "=====================");
+        Debug.Log(treeFansListResponse.Data.Pages.total_count + "=====================");
         return treeFansListResponse;
     }
 }
@@ -43,10 +43,10 @@ public class TreeFansListData
 
 public class TreeFansListPageInfo
 {
-    public int PageNum { get; set; }
+    public int page_num { get; set; }
-    public int PageSize { get; set; }
+    public int page_size { get; set; }
-    public int CurrSize { get; set; }
+    public int curr_size { get; set; }
-    public int TotalCount { get; set; }
+    public int total_count { get; set; }
 }
 
 public class TreeFansListInfo
@@ -54,16 +54,16 @@ public class TreeFansListInfo
     public string Uid { get; set; }
     public string Account { get; set; }
     public string Nickname { get; set; }
-    public string AvatarUrl { get; set; }
+    public string avatar_url { get; set; }
-    public string InviteCode { get; set; }
+    public string invite_code { get; set; }
-    public int CertifyStatus { get; set; }
+    public int certify_status { get; set; }
     public string CreateTime { get; set; }
-    public string LastLoginTime { get; set; }
+    public string last_login_time { get; set; }
-    public int TeamCount { get; set; }
+    public int team_count { get; set; }
-    public int DirectlyCount { get; set; }
+    public int directly_count { get; set; }
-    public int TeamActiveCount { get; set; }
+    public int team_active_count { get; set; }
-    public int DirectlyActiveCount { get; set; }
+    public int directly_active_count { get; set; }
     public int Level { get; set; }
-    public string LevelName { get; set; }
+    public string level_name { get; set; }
-    public string LevelIcon { get; set; }
+    public string level_icon { get; set; }
 }

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

@@ -25,7 +25,9 @@ public class treeGetWater : MonoBehaviour
         //treeGetWaterBody body = new treeGetWaterBody();
         //body.index = index;
         //body.transId = transId; 
+        Debug.Log("ÊÕ¼¯Ë®µÎÈë²Îindxe:" + JsonConvert.SerializeObject(body));
         string response = await myWeb.SendRequest(myWeb.URL + "/api/tree/gather", "POST", JsonConvert.SerializeObject(body), CreateHeaders());
+        
         Debug.Log("生态树水滴采集" + response);
         //bbbb
         //bbbb
@@ -40,5 +42,5 @@ public class treeGetWater : MonoBehaviour
 public class treeGetWaterBody
 {
     public int index;
-    public string transId;
+    public string trans_id;
 }

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

@@ -58,25 +58,25 @@ public class TreeTeamInfo
     public string Uid { get; set; }
     public string Account { get; set; }
     public string Nickname { get; set; }
-    public string AvatarUrl { get; set; }
+    public string avatar_url { get; set; }
-    public string InviteCode { get; set; }
+    public string invite_code { get; set; }
-    public int CertifyStatus { get; set; }//ʵÃû״̬ 0:δʵÃû 1:ÒÑʵÃû
+    public int certify_status { get; set; }//ʵÃû״̬ 0:δʵÃû 1:ÒÑʵÃû
-    public string CreateTime { get; set; }
+    public string create_time { get; set; }
-    public string LastLoginTime { get; set; }
+    public string last_login_time { get; set; }
-    public int TeamCount { get; set; }
+    public int team_count { get; set; }
-    public int DirectlyCount { get; set; }
+    public int directly_count { get; set; }
-    public int TeamActiveCount { get; set; }
+    public int team_active_count { get; set; }
-    public int DirectlyActiveCount { get; set; }
+    public int directly_active_count { get; set; }
     public int Level { get; set; }
-    public string LevelName { get; set; }
+    public string level_name { get; set; }
-    public string LevelIcon { get; set; }
+    public string level_icon { get; set; }
 }
 
 public class TreeTeamItem
 {
     public string Title { get; set; }
     public string Desc { get; set; }
-    public int NowVal { get; set; }
+    public int now_val { get; set; }
-    public int ReqVal { get; set; }
+    public int req_val { get; set; }
     public float Percentage { get; set; }//百分比进度 1 = 100%
 }