Pārlūkot izejas kodu

Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/Game/CSShare
guodong 3 gadi atpakaļ
vecāks
revīzija
c3129cb1e9

+ 2 - 2
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1709" overflow="hidden" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
-  <controller name="ctrlFullLv" pages="0,,1," selected="1"/>
+  <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
   <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
@@ -98,7 +98,7 @@
     <group id="n55_l2by" name="grpStar" xy="11,1221" size="1056,435" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" visible="false" overflow="hidden" lineGap="33" defaultItem="ui://7l6lvkayrhha9k">
+    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" overflow="hidden" lineGap="33" defaultItem="ui://7l6lvkayrhha9k">
       <gearDisplay controller="ctrlTab" pages="2"/>
       <item/>
       <item/>

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -21,9 +21,11 @@ namespace GFGGame
         public const string CARD_REFRESH = "CARD_REFRESH";
 
         public const string PLAT_CARDFOSTER_T1 = "PLAT_CARDFOSTER_T0";
-
         public const string CLOSE_PHOTOGRAPHVIEW = "CLOSE_PHOTOGRAPHVIEW";
 
+        public const string CARD_UP_SKILL = "CARD_UP_SKILL";
+
+
 
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -10,7 +10,7 @@ namespace GFGGame
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         public int[] luckyBoxIds = new int[] { 1, 2, 3 };//奖池列表
         public int startTime = 1635157620;
-        public int endTime = 1643192820;
+        public int endTime = 1704038400;
         public List<ItemData> RewardList
         {
             get { return _rewardsList; }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs

@@ -40,6 +40,7 @@ namespace GFGGame
                 this.skillData.Add(skillId, skillData);
             }
             skillData[skillId].lv += 1;
+            EventAgent.DispatchEvent(ConstMessage.CARD_UP_SKILL);
         }
 
         //获取npc释放技能顺序

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -86,6 +86,9 @@ namespace GFGGame
             {
                 _ui.m_t1.Play();
             });
+
+            EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpSkill);
+
         }
 
 
@@ -583,7 +586,7 @@ namespace GFGGame
             PassivitySkillCfg skillScoreCfg = PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id)[index];
             item.m_txtName.text = skillScoreCfg.name;
 
-            CardSkillCfg[] skillCfgs = CardSkillCfgArray.Instance.GetCfgs(skillScoreCfg.skillId.ToString());
+            CardSkillCfg[] skillCfgs = CardSkillCfgArray.Instance.GetCfgs(skillScoreCfg.skillId);
             SkillData skillData = SkillDataManager.Instance.skillData.ContainsKey(skillScoreCfg.skillId) ? SkillDataManager.Instance.skillData[skillScoreCfg.skillId] : null;
             int lv = skillData == null ? 1 : skillData.lv;
             item.m_txtLv.text = string.Format("{0}级", lv);
@@ -598,7 +601,7 @@ namespace GFGGame
             }
         }
 
-        private void OnClickBtnUpSkill()
+        private void UpSkill()
         {
 
         }

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -22,6 +22,8 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_listConsume.itemRenderer = RenderListStarConsumeItem;
+            EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateView);
+
         }
 
         protected override void OnShown()
@@ -44,11 +46,12 @@ namespace GFGGame
                 return;
             }
             UpdateComLv(_ui.m_comNextLv, lv + 1, "下一级");
+            // _ui.m_listConsume.numItems=
         }
         private void UpdateComLv(UI_ComSkillDiscribe com, int lv, string title)
         {
             com.m_txtLv.text = title;
-            com.m_txtDiscribe.text = CardSkillCfgArray.Instance.GetCfgs(_viewData.skillId.ToString())[lv - 1].describe;
+            com.m_txtDiscribe.text = CardSkillCfgArray.Instance.GetCfgs(_viewData.skillId)[lv - 1].describe;
 
         }
         private void RenderListStarConsumeItem(int index, GObject obj)

+ 19 - 59
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -10,6 +10,7 @@ namespace GFGGame
     public class PhotographSaveView : BaseView
     {
         private UI_PhotographSaveUI _ui;
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -21,6 +22,7 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnSave.onClick.Add(this.OnClickBtnSave);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -31,21 +33,21 @@ namespace GFGGame
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
         }
-        private void OnClickBtnSave()
-        {
-
-
-            string path = Application.persistentDataPath;
-            Debug.Log("文件路径path:" + path);
 
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
 
-#if UNITY_ANDROID
-            int index = Application.persistentDataPath.IndexOf("Android");
-            path = index < 0 ? path : Application.persistentDataPath.Substring(0, index);
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
 
-             path = "/sdcard/DCIM/";
+        private void OnClickBtnSave()
+        {
+            string path = Application.persistentDataPath + "/Pictures/WanshiJing/";
 
-#endif
             //判断目录是否存在,不存在则会创建目录
             if (!Directory.Exists(path))
             {
@@ -59,65 +61,23 @@ namespace GFGGame
 
                 }
             }
-            string fileName = DateUtils.Instance.GetCurTime() + ".png";
-
+            string fileName = "wsj" + DateUtils.Instance.GetCurTime() + ".jpg";
 
-            Debug.Log("文件路径:" + path);
             Texture2D tex = this.viewData as Texture2D;
-            byte[] bytes = tex.EncodeToPNG();//将纹理数据,转化成一个png图片
+            byte[] bytes = tex.EncodeToJPG();//将纹理数据,转化成一个jpg图片
             var filePath = path + fileName;
             File.WriteAllBytes(filePath, bytes);
-            //GetSaveState(path);
-            savePngAndUpdate(filePath);
+            UpdateSystemPhoto(filePath);
         }
 
-
         //调用iOS或Android原生方法保存图片后更新相册.
-        private void savePngAndUpdate(string fileName)
+        private void UpdateSystemPhoto(string filePath)
         {
 #if UNITY_ANDROID
-            GetAndroidJavaObject().Call("scanFile", fileName, "保存成功辣٩(๑>◡<๑)۶ "); //这里我们可以设置保存成功弹窗内容
+            AndroidJavaObject androidJavaObject = new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
+            androidJavaObject.Call("scanFile", filePath, "已保存至相册"); //这里我们可以设置保存成功弹窗内容
 #endif
         }
 
-        //用于获取Android原生方法类对象
-        private AndroidJavaObject GetAndroidJavaObject()
-        {
-            return new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
-        }
-
-        private void GetSaveState(string path)
-        {
-
-            Timers.inst.Add(1, 10, (param) =>
-            {
-                if (File.Exists(path))
-                {
-                    string[] paths = { path };
-                    ScanFile(paths);
-                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
-                }
-            });
-        }
-        //刷新图片,显示到相册中
-        void ScanFile(string[] path)
-        {
-            using (AndroidJavaClass PlayerActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
-            {
-                AndroidJavaObject playerActivity = PlayerActivity.GetStatic<AndroidJavaObject>("currentActivity");
-                using (AndroidJavaObject Conn = new AndroidJavaObject("android.media.MediaScannerConnection", playerActivity, null))
-                {
-                    Conn.CallStatic("scanFile", playerActivity, path, null, null);
-                }
-            }
-        }
-        protected override void OnHide()
-        {
-            base.OnHide();
-        }
-        public override void Dispose()
-        {
-            base.Dispose();
-        }
     }
 }

+ 0 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -28,9 +28,6 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
 
-            // _ui.m_btnSkip.onClick.Add(Skip);
-
-
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
             EventAgent.AddEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
         }

BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes