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

meng_yao/Assets/Resources/Prefabs/Ghitem.prefab

@@ -1043,6 +1043,7 @@ MonoBehaviour:
   IdBtn: {fileID: 1888475739171819190}
   IdText: {fileID: 1888475739408919645}
   username: {fileID: 1888475739198054969}
+  head: {fileID: 1888475738326150204}
 --- !u!1 &1888475739171819188
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab

@@ -343,6 +343,7 @@ MonoBehaviour:
   Activecount: {fileID: 3095757104724791354}
   RegisterTime: {fileID: 2554716571525085631}
   waterNumber: {fileID: 5673584769543089576}
+  headsprite: {fileID: 3775845607762266819}
 --- !u!1 &4556036416265401581
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Scenes/scene_Main.unity

@@ -54711,6 +54711,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1709316770842035796, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: f5b1db4774beacc4583f991f993702c7, type: 3}
     - target: {fileID: 2246699873070204022, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 1.1040039
@@ -54835,6 +54839,38 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 137.29
       objectReference: {fileID: 0}
+    - target: {fileID: 4155964986668301658, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -329.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4155964986668301658, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 98.78296
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 564.8472
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 285.36
+      objectReference: {fileID: 0}
+    - target: {fileID: 4709789106451073547, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 16
+      objectReference: {fileID: 0}
     - target: {fileID: 4752249951732027985, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -54887,6 +54923,30 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 730.5114
+      objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 370.74432
+      objectReference: {fileID: 0}
+    - target: {fileID: 7536360756043340587, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 16
+      objectReference: {fileID: 0}
     - target: {fileID: 7559150911668425800, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
       propertyPath: m_LocalScale.x
       value: 1.4
@@ -54939,6 +54999,10 @@ PrefabInstance:
       propertyPath: m_Text
       value: "\u6218\u961F"
       objectReference: {fileID: 0}
+    - target: {fileID: 8000202220636743537, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: f5b1db4774beacc4583f991f993702c7, type: 3}
     - target: {fileID: 9109179790208934886, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -92942,6 +93006,28 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1072042464}
   m_CullTransparentMesh: 1
+--- !u!114 &1073156654 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2653017574720209890, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1073156655 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3440755766886179492, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1073200879
 GameObject:
   m_ObjectHideFlags: 0
@@ -127669,7 +127755,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1475159789
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -202958,6 +203044,46 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 914645750}
     m_Modifications:
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 730
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 372.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100378, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1605100379, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: f5b1db4774beacc4583f991f993702c7, type: 3}
+    - target: {fileID: 1959425528, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -328.35
+      objectReference: {fileID: 0}
+    - target: {fileID: 1959425528, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 92.260925
+      objectReference: {fileID: 0}
+    - target: {fileID: 811419366112732501, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2869265158924170702, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -202974,6 +203100,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3440755765421972194, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -331.3471
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755765421972194, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 93.761444
+      objectReference: {fileID: 0}
     - target: {fileID: 3440755765570656168, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -203086,6 +203220,10 @@ PrefabInstance:
       propertyPath: m_ChildAlignment
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3440755766886179494, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -203118,6 +203256,34 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218820, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: f5b1db4774beacc4583f991f993702c7, type: 3}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 730
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 370.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 16
+      objectReference: {fileID: 0}
     - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -203178,10 +203344,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: head
+      value: 
+      objectReference: {fileID: 1073156655}
     - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: start
       value: 
       objectReference: {fileID: 8687261538848957037}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: Invitehead
+      value: 
+      objectReference: {fileID: 1073156654}
     - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: ActiveUsers
       value: 

meng_yao/Assets/res/main_slices/img_jdt004_ful.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: f5b1db4774beacc4583f991f993702c7
+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/scene_Main/Tree_team.cs

@@ -13,10 +13,12 @@ public class Tree_team : MonoBehaviour
     public GameObject start;
     public GameObject Invitewaterobj;
     public Text waternumner;
+    public Image head;
 
     public Text Inviteusername;
     public Text Inviteuserid;
     public Text Invitewaternumner;
+    public Image Invitehead;
 
     public Text ActiveUsers;
     public Text TeamName;
@@ -36,6 +38,7 @@ public class Tree_team : MonoBehaviour
         {
             Inviteusername.text = info.Data.inviter.Nickname;
             Inviteuserid.text = info.Data.inviter.Uid;
+            Invitehead.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(info.Data.inviter.avatar_url);
             Invitewaternumner.text =info.Data.inviter.water.ToString();
             Invitewaterobj.gameObject.SetActive(true);
             start.gameObject.SetActive(true);
@@ -54,6 +57,7 @@ public class Tree_team : MonoBehaviour
         DirectPushFill.fillAmount = (float)info.Data.Info.directly_active_count / info.Data.Info.directly_count;
         PushNum.text = info.Data.Info.team_active_count + "/" + info.Data.Info.team_count;
         PushFill.fillAmount = (float)info.Data.Info.team_active_count/info.Data.Info.team_count;
+        head.sprite= await Scene_main_jiekou.instance.ImageLoaderSprite(info.Data.Info.avatar_url);
         Init();
     }
 
@@ -75,6 +79,7 @@ public class Tree_team : MonoBehaviour
             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);
         }
     }
 

meng_yao/Assets/script/scene_Main/Tree_team_item.cs

@@ -12,7 +12,7 @@ public class Tree_team_item : MonoBehaviour
     public Text Activecount;
     public Text RegisterTime;
     public Text waterNumber;
-
+    public Image headsprite;
     void Start()
     {
         

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

@@ -12,6 +12,7 @@ public class GhItem : MonoBehaviour
     public Button IdBtn;
     public Text IdText;
     public Text username;
+    public Image head;
 
     Clipboard clipboard = new Clipboard();
     void Start()

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

@@ -23,6 +23,7 @@ public class GhPanel : MonoBehaviour
             obj.GetComponent<GhItem>().username.text = info.Data.members[i].name;
             obj.GetComponent<GhItem>().WxText.text = info.Data.members[i].wechat;
             obj.GetComponent<GhItem>().QqText.text = info.Data.members[i].qq;
+            obj.GetComponent<GhItem>().head.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(info.Data.members[i].avatar_url);
         }
     }