界面的切换以及收集水滴接口的接入

This commit is contained in:
liuliang 2024-12-20 15:59:27 +08:00
parent 44fb1ca024
commit 981a99f2c2
15 changed files with 13451 additions and 3691 deletions

View File

@ -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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -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
wrapV: 0
wrapU: 1
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:

View File

@ -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
wrapV: 0
wrapU: 1
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -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:

View File

@ -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,8 +38,30 @@ 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()
async void Start()
{
instance = this;
TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();

View File

@ -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();
}
}

View File

@ -5,8 +5,8 @@ using UnityEngine.UI;
public class Tree_team : MonoBehaviour
{
public Text DirectPushNum;
public Text PushNum;
public Text DirectPushNum;//直推
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;
DirectPushNum.text = info.Data.Items[0].NowVal+"/" + info.Data.Items[0].ReqVal;
TeamCount.text = "团队人数:"+info.Data.Info.team_count;
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;
PushFill.fillAmount = info.Data.Items[0].Percentage;
PushNum.text = info.Data.Items[1].now_val + "/" + info.Data.Items[0].req_val;
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;
}
}

View File

@ -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()
{
}
}

View File

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

View File

@ -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 PageSize { get; set; }
public int CurrSize { get; set; }
public int TotalCount { get; set; }
public int page_num { get; set; }
public int page_size { get; set; }
public int curr_size { 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 InviteCode { get; set; }
public int CertifyStatus { get; set; }
public string avatar_url { get; set; }
public string invite_code { get; set; }
public int certify_status { get; set; }
public string CreateTime { get; set; }
public string LastLoginTime { get; set; }
public int TeamCount { get; set; }
public int DirectlyCount { get; set; }
public int TeamActiveCount { get; set; }
public int DirectlyActiveCount { get; set; }
public string last_login_time { get; set; }
public int team_count { get; set; }
public int directly_count { get; set; }
public int team_active_count { get; set; }
public int directly_active_count { get; set; }
public int Level { get; set; }
public string LevelName { get; set; }
public string LevelIcon { get; set; }
public string level_name { get; set; }
public string level_icon { get; set; }
}

View File

@ -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;
}

View File

@ -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 InviteCode { get; set; }
public int CertifyStatus { get; set; }//ʵÃû״̬ 0:δʵÃû 1:ÒÑʵÃû
public string CreateTime { get; set; }
public string LastLoginTime { get; set; }
public int TeamCount { get; set; }
public int DirectlyCount { get; set; }
public int TeamActiveCount { get; set; }
public int DirectlyActiveCount { get; set; }
public string avatar_url { get; set; }
public string invite_code { get; set; }
public int certify_status { get; set; }//ʵÃû״̬ 0:δʵÃû 1:ÒÑʵÃû
public string create_time { get; set; }
public string last_login_time { get; set; }
public int team_count { get; set; }
public int directly_count { get; set; }
public int team_active_count { get; set; }
public int directly_active_count { get; set; }
public int Level { get; set; }
public string LevelName { get; set; }
public string LevelIcon { get; set; }
public string level_name { 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 ReqVal { get; set; }
public int now_val { get; set; }
public int req_val { get; set; }
public float Percentage { get; set; }//百分比进度 1 = 100%
}