迁移代码

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -90,8 +90,6 @@ namespace GFGGame
         /// 部件评分
         /// </summary>
         /// <param name="partId">评分部位</param>
-        /// <param name="clickState">点击状态</param>
-        /// <param name="mainScore">总主属性</param>
         /// <returns></returns>
         public double GetPartBaseScore(int partId)
         {
@@ -128,7 +126,7 @@ namespace GFGGame
         }
         public double GetPartItemScore(int partId)
         {
-            return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE; ;
+            return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE;
         }
         public double GetPartItemClickScore(double mainScore, int clickState)
         {
@@ -153,11 +151,11 @@ namespace GFGGame
         {
             skillScore = 0;
             showCard = false;
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(StoryDataManager.currentCardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(StoryDataManager.currentCardId);
             for (int i = 0; i < cfgs.Length; i++)
             {
                 if (cfgs.Length == 0) break;
-                SkillScoreCfg cfg = cfgs[i];
+                PassivitySkillCfg cfg = cfgs[i];
                 if (partId == cfg.subTypes || cfg.subTypes == 0)
                 {
                     int isProbability = Random.Range(0, 100) < cfg.probability ? 1 : 0;
@@ -188,9 +186,9 @@ namespace GFGGame
         /// </summary>
         /// <param name="cardId"></param>
         /// <returns></returns>
-        public SkillScoreCfg GetShowSkillCfg(int cardId)
+        public PassivitySkillCfg GetShowSkillCfg(int cardId)
         {
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(cardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
             if (cfgs.Length == 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");
@@ -212,9 +210,9 @@ namespace GFGGame
         /// </summary>
         /// <param name="cardId"></param>
         /// <returns></returns>
-        public SkillScoreCfg GetMainSkillCfg(int cardId)
+        public PassivitySkillCfg GetMainSkillCfg(int cardId)
         {
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(cardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
             if (cfgs.Length == 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");

GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs

@@ -1,9 +1,17 @@
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {
     public class SkillDataManager : SingletonBase<SkillDataManager>
     {
+        public const int MINE = 0;
+        public const int NPC = 1;
+        public const string SKILL_ADD = "add";
+        public const string SKILL_MINUS = "minus";
+        public const string SKILL_BREAK = "break";
+        public const string SKILL_SHIELD = "shield";
+
         public Dictionary<int, SkillData> skillData = new Dictionary<int, SkillData>();
 
         public void Clear()
@@ -33,5 +41,74 @@ namespace GFGGame
             }
             skillData[skillId].lv += 1;
         }
+
+        // public BuffData mineBuffData = new BuffData();
+        // public BuffData npcBuffData = new BuffData();
+        // //更新对战主动技能数据
+        // public void UpdateTargetFightSkillValue(RoleSkillCfg cfg, int role, double mineScore)
+        // {
+        //     int score = 0;
+        //     int targetScore = 0;
+        //     BuffData buffData;
+        //     BuffData targetBuffData;
+        //     if (role == MINE)
+        //     {
+        //         score = EquipDataCache.cacher.totalScore;
+        //         targetScore = EquipDataCache.cacher.npcTotalScore;
+        //         buffData = mineBuffData;
+        //         targetBuffData = npcBuffData;
+        //     }
+        //     else
+        //     {
+        //         score = EquipDataCache.cacher.npcTotalScore;
+        //         targetScore = EquipDataCache.cacher.totalScore;
+        //         buffData = npcBuffData;
+        //         targetBuffData = mineBuffData;
+        //     }
+        //     switch (cfg.buff)
+        //     {
+        //         case SKILL_ADD:
+        //             if (buffData.addCount >= cfg.limiteCount) return;
+        //             buffData.addCount++;
+        //             score += (int)mineScore * cfg.value / 100;
+        //             break;
+        //         case SKILL_MINUS:
+        //             if (buffData.minusCount >= cfg.limiteCount) return;
+        //             buffData.minusCount++;
+        //             if (targetBuffData.isShield)
+        //             {
+        //                 targetBuffData.isShield = false;
+        //                 return;
+        //             }
+        //             targetScore -= (int)mineScore * cfg.value / 100;
+
+        //             break;
+        //         case SKILL_BREAK:
+        //             if (buffData.breakCount >= cfg.limiteCount) return;
+        //             buffData.breakCount++;
+        //             break;
+        //         case SKILL_SHIELD:
+        //             if (buffData.shieldCount >= cfg.limiteCount) return;
+
+        //             buffData.shieldCount++;
+        //             buffData.isShield = true;
+        //             break;
+        //     }
+        // }
+
+        //获取npc释放技能顺序
+        public Dictionary<int, RoleSkillCfg> GetNpcSkill()
+        {
+            Dictionary<int, RoleSkillCfg> npcSkillDic = new Dictionary<int, RoleSkillCfg>();
+            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+            List<int> arr = new List<int> { 0, 1, 2, 3, 4, 5, 6, 7 };
+            for (int i = 0; i < roleSkillCfgs.Length; i++)
+            {
+                int partIndex = Random.Range(0, arr.Count);
+                npcSkillDic.Add(arr[partIndex], roleSkillCfgs[i]);
+                arr.RemoveAt(partIndex);
+            }
+            return npcSkillDic;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/VO/SkillData.cs

@@ -7,4 +7,12 @@ namespace GFGGame
         public int id;
         public int lv;
     }
+    public class BuffData
+    {
+        public bool isShield = false;//是否护盾中
+        public int addCount = 0;//天工使用次数
+        public int minusCount = 0;//荆钗使用次数
+        public int breakCount = 0;//断织使用次数
+        public int shieldCount = 0;//锦衣使用次数
+    }
 }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using System;
 using System.Linq;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -76,6 +77,20 @@ namespace GFGGame
             }
         }
 
+        //战斗对象最终得分
+        private int _targetTotalScore;
+        public int npcTotalScore
+        {
+            get
+            {
+                return _targetTotalScore;
+            }
+            set
+            {
+                _targetTotalScore = value;
+            }
+        }
+
         public void Dispose()
         {
             _sceneObj = null;
@@ -522,5 +537,19 @@ namespace GFGGame
             }
             return true;
         }
+
+        //根据位置原点和随机范围获取评分位置
+        public void GetCirclePos(Vector2 pos, int range, out float x, out float y)
+        {
+            int numX = UnityEngine.Random.Range(0, 2);
+            int signX = numX % 2 == 0 ? 1 : -1;
+            float rangeX = UnityEngine.Random.Range(0, range);
+            x = pos.x + signX * (rangeX);
+
+            int numY = UnityEngine.Random.Range(0, 2);
+            int signY = numY % 2 == 0 ? 1 : -1;
+            float rangeY = UnityEngine.Random.Range(0, range);
+            y = pos.y + signY * (rangeY);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/ExcelConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1d5e1b9bebe16df4bb0dba92a5d2bb72
+guid: eff0429ed8f94454ca3dcb06d43b0e18
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f31b5f9df14c4f4dbffb48c712daeb9
+guid: db16dd55f18d81a4a8c9068f29d0aae5
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a6329cdeb10d1f4b9be34a25e6edc13
+guid: 6a2d1e4d164646a48a79fd2514d090d0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19216ab11d7afd643a69ccdcc93c5b36
+guid: ac69a4094aeb2d74996978a3a1e61ccc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/StoryCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5e66506c93223145b276ba8945157c7
+guid: 28584a2446031ea46925b2ec41364f8a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_ListRewardItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Mail
+{
+    public partial class UI_ListRewardItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtCount;
+        public GImage m_imgGot;
+        public const string URL = "ui://y44a413eehs9h";
+        public const string PACKAGE_NAME = "Mail";
+        public const string RES_NAME = "ListRewardItem";
+        private static UI_ListRewardItem _proxy;
+
+        public static UI_ListRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRewardItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChildAt(1);
+            m_txtName = (GTextField)comp.GetChildAt(3);
+            m_txtCount = (GTextField)comp.GetChildAt(4);
+            m_imgGot = (GImage)comp.GetChildAt(5);
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtName = null;
+            m_txtCount = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_ListRewardItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComBtnSkill
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GProgressBar m_proCD;
+        public GTextField m_txtName;
+        public const string URL = "ui://mfvz4q8kuxajc2";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComBtnSkill";
+        private static UI_ComBtnSkill _proxy;
+
+        public static UI_ComBtnSkill Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBtnSkill();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComBtnSkill Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBtnSkill();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_proCD = (GProgressBar)comp.GetChild("proCD");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_proCD = null;
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComRoleSkillScore
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtScore;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kuj53c9";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComRoleSkillScore";
+        private static UI_ComRoleSkillScore _proxy;
+
+        public static UI_ComRoleSkillScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComRoleSkillScore();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComRoleSkillScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComRoleSkillScore();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtScore = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillMinus.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComSkillMinus
+    {
+        public GComponent target;
+        public UI_ProgressBarSingleScore m_proMinus;
+        public const string URL = "ui://mfvz4q8kvbe8c6";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComSkillMinus";
+        private static UI_ComSkillMinus _proxy;
+
+        public static UI_ComSkillMinus Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSkillMinus();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComSkillMinus Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSkillMinus();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_proMinus = (UI_ProgressBarSingleScore)UI_ProgressBarSingleScore.Create(comp.GetChild("proMinus"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_proMinus.Dispose();
+            m_proMinus = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillMinus.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComSkillShield
+    {
+        public GComponent target;
+        public GImage m_img;
+        public const string URL = "ui://mfvz4q8kvbe8c7";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComSkillShield";
+        private static UI_ComSkillShield _proxy;
+
+        public static UI_ComSkillShield Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSkillShield();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComSkillShield Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSkillShield();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_img = (GImage)comp.GetChild("img");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_img = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarSingleScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ProgressBarSingleScore
+    {
+        public GProgressBar target;
+        public GTextField m_txtCount;
+        public GImage m_imgFirstScore;
+        public const string URL = "ui://mfvz4q8kvuz5bh";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ProgressBarSingleScore";
+        private static UI_ProgressBarSingleScore _proxy;
+
+        public static UI_ProgressBarSingleScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBarSingleScore();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBarSingleScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBarSingleScore();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtCount = null;
+            m_imgFirstScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarSingleScore.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ProgressBarTargetScore
+    {
+        public GProgressBar target;
+        public GTextField m_txtMineScore;
+        public GTextField m_txtNpcScore;
+        public const string URL = "ui://mfvz4q8kuj53c8";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ProgressBarTargetScore";
+        private static UI_ProgressBarTargetScore _proxy;
+
+        public static UI_ProgressBarTargetScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBarTargetScore();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBarTargetScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBarTargetScore();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtMineScore = (GTextField)comp.GetChild("txtMineScore");
+            m_txtNpcScore = (GTextField)comp.GetChild("txtNpcScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtMineScore = null;
+            m_txtNpcScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -18,7 +18,7 @@ namespace UI.Main
         public GGraph m_grh_5;
         public GGraph m_grh_6;
         public GGraph m_grh_7;
-        public UI_ProgressBar1 m_proCount;
+        public UI_ProgressBarSingleScore m_proScore;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -77,7 +77,7 @@ namespace UI.Main
             m_grh_5 = (GGraph)comp.GetChild("grh_5");
             m_grh_6 = (GGraph)comp.GetChild("grh_6");
             m_grh_7 = (GGraph)comp.GetChild("grh_7");
-            m_proCount = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proCount"));
+            m_proScore = (UI_ProgressBarSingleScore)UI_ProgressBarSingleScore.Create(comp.GetChild("proScore"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,8 +95,8 @@ namespace UI.Main
             m_grh_5 = null;
             m_grh_6 = null;
             m_grh_7 = null;
-            m_proCount.Dispose();
-            m_proCount = null;
+            m_proScore.Dispose();
+            m_proScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -12,6 +12,29 @@ namespace UI.Main
         public UI_CompFightResultName m_targetName;
         public GButton m_btnSkip;
         public UI_CompFightScore m_targetScore;
+        public GGraph m_grh_0;
+        public GGraph m_grh_1;
+        public GGraph m_grh_2;
+        public GGraph m_grh_3;
+        public GGraph m_grh_4;
+        public GGraph m_grh_5;
+        public GGraph m_grh_6;
+        public GGraph m_grh_7;
+        public UI_ProgressBarTargetScore m_proScore;
+        public UI_comTargetCircle m_comMineCircle;
+        public UI_comTargetCircle m_comTargetCircle;
+        public UI_ComBtnSkill m_btnSkill0;
+        public UI_ComBtnSkill m_btnSkill1;
+        public UI_ComBtnSkill m_btnSkill2;
+        public UI_ComBtnSkill m_btnSkill3;
+        public UI_ComSkillMinus m_ComMinusMine;
+        public UI_ComSkillShield m_ComShieldMine;
+        public UI_ComSkillMinus m_ComMinusNpc;
+        public UI_ComSkillShield m_ComShieldNpc;
+        public UI_ComRoleSkillScore m_ComRoleSkillMineAdd;
+        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
+        public UI_ComRoleSkillScore m_ComRoleSkillMineMinus;
+        public UI_ComRoleSkillScore m_ComRoleSkillNpcMinus;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -64,6 +87,29 @@ namespace UI.Main
             m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_targetScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("targetScore"));
+            m_grh_0 = (GGraph)comp.GetChild("grh_0");
+            m_grh_1 = (GGraph)comp.GetChild("grh_1");
+            m_grh_2 = (GGraph)comp.GetChild("grh_2");
+            m_grh_3 = (GGraph)comp.GetChild("grh_3");
+            m_grh_4 = (GGraph)comp.GetChild("grh_4");
+            m_grh_5 = (GGraph)comp.GetChild("grh_5");
+            m_grh_6 = (GGraph)comp.GetChild("grh_6");
+            m_grh_7 = (GGraph)comp.GetChild("grh_7");
+            m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
+            m_comMineCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comMineCircle"));
+            m_comTargetCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comTargetCircle"));
+            m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));
+            m_btnSkill1 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill1"));
+            m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
+            m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
+            m_ComMinusMine = (UI_ComSkillMinus)UI_ComSkillMinus.Create(comp.GetChild("ComMinusMine"));
+            m_ComShieldMine = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldMine"));
+            m_ComMinusNpc = (UI_ComSkillMinus)UI_ComSkillMinus.Create(comp.GetChild("ComMinusNpc"));
+            m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
+            m_ComRoleSkillMineAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineAdd"));
+            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
+            m_ComRoleSkillMineMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineMinus"));
+            m_ComRoleSkillNpcMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcMinus"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +122,44 @@ namespace UI.Main
             m_btnSkip = null;
             m_targetScore.Dispose();
             m_targetScore = null;
+            m_grh_0 = null;
+            m_grh_1 = null;
+            m_grh_2 = null;
+            m_grh_3 = null;
+            m_grh_4 = null;
+            m_grh_5 = null;
+            m_grh_6 = null;
+            m_grh_7 = null;
+            m_proScore.Dispose();
+            m_proScore = null;
+            m_comMineCircle.Dispose();
+            m_comMineCircle = null;
+            m_comTargetCircle.Dispose();
+            m_comTargetCircle = null;
+            m_btnSkill0.Dispose();
+            m_btnSkill0 = null;
+            m_btnSkill1.Dispose();
+            m_btnSkill1 = null;
+            m_btnSkill2.Dispose();
+            m_btnSkill2 = null;
+            m_btnSkill3.Dispose();
+            m_btnSkill3 = null;
+            m_ComMinusMine.Dispose();
+            m_ComMinusMine = null;
+            m_ComShieldMine.Dispose();
+            m_ComShieldMine = null;
+            m_ComMinusNpc.Dispose();
+            m_ComMinusNpc = null;
+            m_ComShieldNpc.Dispose();
+            m_ComShieldNpc = null;
+            m_ComRoleSkillMineAdd.Dispose();
+            m_ComRoleSkillMineAdd = null;
+            m_ComRoleSkillNpcAdd.Dispose();
+            m_ComRoleSkillNpcAdd = null;
+            m_ComRoleSkillMineMinus.Dispose();
+            m_ComRoleSkillMineMinus = null;
+            m_ComRoleSkillNpcMinus.Dispose();
+            m_ComRoleSkillNpcMinus = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_comTargetCircle
+    {
+        public GComponent target;
+        public GTextField m_txtCount0;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kmza1c1";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "comTargetCircle";
+        private static UI_comTargetCircle _proxy;
+
+        public static UI_comTargetCircle Create(GObject gObject = null)
+        {
+            var ui = new UI_comTargetCircle();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_comTargetCircle Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTargetCircle();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtCount0 = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_XiuFangUI.cs

@@ -59,11 +59,11 @@ namespace UI.XiuFang
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnClothingShop = (GLoader)comp.GetChild("btnClothingShop");
-            m_btnClothingUpgrade = (GLoader)comp.GetChild("btnClothingUpgrade");
-            m_btnSuitSynthetic = (GLoader)comp.GetChild("btnSuitSynthetic");
+            m_bg = (GLoader)comp.GetChildAt(0);
+            m_btnBack = (GButton)comp.GetChildAt(1);
+            m_btnClothingShop = (GLoader)comp.GetChildAt(4);
+            m_btnClothingUpgrade = (GLoader)comp.GetChildAt(5);
+            m_btnSuitSynthetic = (GLoader)comp.GetChildAt(6);
         }
         public void Dispose(bool disposeTarget = false)
         {

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -571,7 +571,7 @@ namespace GFGGame
 
         private void UpdateUpSkillView()
         {
-            SkillScoreCfg[] skillScores = SkillScoreCfgArray.Instance.GetCfgs(_viewData.id);
+            PassivitySkillCfg[] skillScores = PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id);
             _comFosterBottom.m_listSkill.numItems = skillScores.Length;
 
         }
@@ -579,7 +579,7 @@ namespace GFGGame
         private void RenderListSkilItem(int index, GObject obj)
         {
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
-            SkillScoreCfg skillScoreCfg = SkillScoreCfgArray.Instance.GetCfgs(_viewData.id)[index];
+            PassivitySkillCfg skillScoreCfg = PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id)[index];
             item.m_txtName.text = skillScoreCfg.name;
 
             CardSkillCfg[] skillCfgs = CardSkillCfgArray.Instance.GetCfgs(skillScoreCfg.skillId.ToString());

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -5,7 +5,7 @@ namespace GFGGame
     public class CardSkillView : BaseWindow
     {
         private UI_CardSkillUI _ui;
-        private SkillScoreCfg _viewData;
+        private PassivitySkillCfg _viewData;
 
         public override void Dispose()
         {
@@ -28,7 +28,7 @@ namespace GFGGame
         {
             base.OnShown();
 
-            _viewData = (SkillScoreCfg)viewData;
+            _viewData = (PassivitySkillCfg)viewData;
             _ui.m_txtName.text = _viewData.name;
         }
         private void UpdateView()
@@ -38,7 +38,7 @@ namespace GFGGame
             SkillData skillData = SkillDataManager.Instance.skillData.ContainsKey(_viewData.skillId) ? SkillDataManager.Instance.skillData[_viewData.skillId] : null;
             int lv = skillData == null ? 1 : skillData.lv;
             UpdateComLv(_ui.m_comCurLV, lv, lv + "级");
-            if (skillData != null && skillData.lv == SkillScoreCfgArray.Instance.GetCfgs(_viewData.id).Length) //已满级
+            if (skillData != null && skillData.lv == PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id).Length) //已满级
             {
                 _ui.m_c1.selectedIndex = 1;
                 return;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -49,7 +49,7 @@ namespace GFGGame
         private void UpdateView(int index)
         {
             int cardId = cardList[index].id;
-            SkillScoreCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
+            PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             _ui.m_txtName.text = cfg == null ? "" : cfg.name;
             _ui.m_txtDiscribe.text = cfg == null ? "" : cfg.describe1;
             _ui.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _scoreType);
@@ -72,7 +72,7 @@ namespace GFGGame
         private void OnBtnComfirmClick()
         {
             int cardId = cardList[_ui.m_listCard.selectedIndex].id;
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(cardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
             StoryDataManager.currentCardId = cfgs.Length > 0 ? cardId : -1;
             this.Hide();
             EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -50,10 +50,12 @@ namespace GFGGame
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(StoryDataManager.currentLevelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-            _ui.m_proCount.target.max = fightCfg.score3;
-            _ui.m_proCount.target.value = 0;
-            _ui.m_proCount.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proCount.target.width;
-            _ui.m_proCount.m_imgCurScore.x = 0;
+            _ui.m_proScore.target.max = fightCfg.score3;
+            _ui.m_proScore.target.value = 0;
+            _ui.m_proScore.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
+            // _ui.m_proCount.m_imgCurScore.x = 0;
+            // _ui.m_comProCount.m_comBar.width = 0;
+            // _ui.m_comProCount.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_comProCount.target.width;
 
             _index = 0;
             _score = 0;
@@ -89,16 +91,17 @@ namespace GFGGame
         {
             Debug.Log("index:" + _index);
             Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
-            int numX = UnityEngine.Random.Range(0, 2);
-            int signX = numX % 2 == 0 ? 1 : -1;
-            float rangeX = UnityEngine.Random.Range(0, _range);
-            float x = pos.x + signX * (rangeX);
+            // int numX = UnityEngine.Random.Range(0, 2);
+            // int signX = numX % 2 == 0 ? 1 : -1;
+            // float rangeX = UnityEngine.Random.Range(0, _range);
+            float x = 0f;// pos.x + signX * (rangeX);
 
-            int numY = UnityEngine.Random.Range(0, 2);
-            int signY = numY % 2 == 0 ? 1 : -1;
-            float rangeY = UnityEngine.Random.Range(0, _range);
-            float y = pos.y + signY * (rangeY);
+            // int numY = UnityEngine.Random.Range(0, 2);
+            // int signY = numY % 2 == 0 ? 1 : -1;
+            // float rangeY = UnityEngine.Random.Range(0, _range);
+            float y = 0f;// pos.y + signY * (rangeY);
 
+            EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
             _ui.m_comClickCircle.target.SetXY(x, y);
             _ui.m_comClickCircle.target.visible = true;
             _ui.m_comClickCircle.m_t0.Play(CircleScoreEnd);
@@ -116,9 +119,7 @@ namespace GFGGame
                 CircleResuleEnd();
             });
 
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
-            SetScoreUI();
+
 
 
         }
@@ -131,10 +132,14 @@ namespace GFGGame
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
             double clickScore = +ScoreSystemData.Instance.GetPartItemClickScore(_mainScore, clickState);
             int count = (int)(partScore + clickScore);
-            Debug.Log("partScore:" + partScore + "   clickScore:" + clickScore + "   count:" + count + "   clickState:" + clickState + "  _mainScore:" + _mainScore);
+            // Debug.Log("partScore:" + partScore + "   clickScore:" + clickScore + "   count:" + count + "   clickState:" + clickState + "  _mainScore:" + _mainScore);
             comScoreResult.m_txtCount0.text = count.ToString();
             comScoreResult.m_txtCount1.text = count.ToString();
             comScoreResult.m_txtCount2.text = count.ToString();
+
+            // int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
+            _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
+            SetScoreUI();
         }
 
         private void CircleResuleEnd()
@@ -214,10 +219,8 @@ namespace GFGGame
         {
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
             _ui.m_selfScore.m_txtScore.text = Math.Round(_score).ToString();
-            _ui.m_proCount.target.value = _score;
-            float pos = ((float)_ui.m_proCount.target.value / (float)_ui.m_proCount.target.max);
-            _ui.m_proCount.m_imgCurScore.x = pos > 1 ? _ui.m_proCount.target.width : pos * _ui.m_proCount.target.width;
-            _ui.m_proCount.m_txtCount.text = string.Format("总分:{0}", (int)Math.Round(_score));
+            _ui.m_proScore.target.TweenValue(_score, 0.2f);
+
         }
 
         private void Skip(object param = null)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -3,6 +3,8 @@ using UnityEngine;
 using UI.Main;
 using System.Collections;
 using System;
+using System.Collections.Generic;
+
 namespace GFGGame
 {
     public class StoryFightTargetScoreView : BaseView
@@ -10,13 +12,24 @@ namespace GFGGame
         private UI_StoryFightTargetScoreUI _ui;
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
-        private int _index;
-        private int _score;
-        private int _targetScore;
+
+
+        private double _targetScore;
+        private double _score;//当前总分数
+        private int _index;//当前评分part
+        private double _skillScore = 0;//当前卡牌技能分
+        private bool _showCard = false;//当前是否显示卡牌技能
+        private double _mainScore;//总主属性分
+        private double _targetMainScore;//战斗目标总主属性分
+        private int _prefectCount = 0;//卓越点击数量
+        private const int _range = 30;//圆圈随机范围
+        private float _time = 0;// 登峰造极按住的时间
+
+        private Dictionary<int, RoleSkillCfg> _npcSkillDic;
 
         public override void Dispose()
         {
-            if(_scenePrefab != null)
+            if (_scenePrefab != null)
             {
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
@@ -32,12 +45,22 @@ namespace GFGGame
             isfullScreen = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTargetScore"));
+
+            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+            for (int i = 0; i < roleSkillCfgs.Length; i++)
+            {
+                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+                btnSkill.data = roleSkillCfgs[i];
+                GLoader icon = btnSkill.GetChild("icon").asLoader;
+                icon.onClick.Add(() => { OnBtnSkillClick(btnSkill); });
+            }
         }
 
         protected override void OnInit()
         {
             base.OnInit();
-            _ui.m_btnSkip.onClick.Add(() => {
+            _ui.m_btnSkip.onClick.Add(() =>
+            {
                 Skip();
             });
         }
@@ -45,7 +68,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if(_sceneObject == null)
+            if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
@@ -55,56 +78,260 @@ namespace GFGGame
             SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
             _ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
             _ui.m_targetName.m_txtName.text = fightCfg.targetName;
+
+            UpdateNormal();
+
+            ScoreSystemData.Instance.SetEquipDicWithType();
+            _npcSkillDic = SkillDataManager.Instance.GetNpcSkill();
             _index = 0;
-            _targetScore = fightCfg.score1;
-            RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl);
-            _score = roleLevelCfg.baseScore;
-            int targetScore = (int)Math.Floor((double)_targetScore/(EquipDataCache.cacher.equipDatas.Length + 1));
-            _ui.m_selfScore.m_txtScore.text = "" + _score;
-            _ui.m_targetScore.m_txtScore.text = "" + targetScore;
-            Timers.inst.Add(0.1f, 0, UpdateScore);
+            _score = 0;
+            _targetScore = 0;
+            _mainScore = ScoreSystemData.Instance.GetMainScore();
+            _targetMainScore = fightCfg.targetMainScore;
+
+            Timers.inst.Add(0.5f, 1, (param) =>
+           {
+               CircleScoreStart(null);
+           });//评分结束
+        }
+        private void UpdateNormal()
+        {
+            _ui.m_btnSkill0.m_proCD.visible = false;
+            _ui.m_btnSkill1.m_proCD.visible = false;
+            _ui.m_btnSkill2.m_proCD.visible = false;
+            _ui.m_btnSkill3.m_proCD.visible = false;
+            _ui.m_ComMinusNpc.target.visible = false;
+            _ui.m_ComMinusMine.target.visible = false;
+            _ui.m_ComShieldNpc.target.visible = false;
+            _ui.m_ComShieldMine.target.visible = false;
+            _ui.m_proScore.target.max = 100;
+            _ui.m_proScore.target.value = 50;
         }
 
-        protected override void OnHide()
+        private void CircleScoreStart(object param)
         {
-            base.OnHide();
-            if(_sceneObject != null)
+            _skillScore = 0;//技能附加分
+            _showCard = false;
+
+            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
+            ScoreSystemData.Instance.GetPartItemCardScore(_mainScore, partId, out _skillScore, out _showCard);
+
+            if (_showCard)
             {
-                GameObject.Destroy(_sceneObject);
-                _sceneObject = null;
+                ViewManager.Show<StorySkillView>(_skillScore);
+            }
+            else
+            {
+                UpdateCircleResult();
             }
         }
 
-        private void UpdateScore(object param)
+
+        private void UpdateCircleResult()
         {
-            int[] equipDatas = EquipDataCache.cacher.equipDatas;
-            int len = equipDatas.Length;
-            if(_index < len)
+            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
+            double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
+            _ui.m_comMineCircle.m_txtCount0.text = ((int)partScore).ToString();
+            _score += (partScore + _skillScore);
+            EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
+
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(StoryDataManager.currentLevelID);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
+            _ui.m_comTargetCircle.m_txtCount0.text = targetScore.ToString();
+            _targetScore += targetScore;
+            EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
+
+            UpdateProgressBar();
+            SetCirclePos();
+            ReleaseNpcSkill();
+        }
+        private void UpdateProgressBar()
+        {
+            _ui.m_proScore.m_txtMineScore.text = ((int)_score).ToString();
+            _ui.m_proScore.m_txtNpcScore.text = ((int)_targetScore).ToString();
+            double value = _score / (_score + _targetScore) * _ui.m_proScore.target.max;
+            _ui.m_proScore.target.TweenValue(value, 0.5f);
+        }
+        private void SetCirclePos()
+        {
+            Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
+            float x = 0f;
+            float y = 0f;
+            EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
+            _ui.m_comMineCircle.target.SetXY(x, y);
+            _ui.m_comMineCircle.target.visible = true;
+            _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
+
+            _ui.m_comTargetCircle.target.SetXY(_ui.target.width - x, y);
+            _ui.m_comTargetCircle.target.visible = true;
+            _ui.m_comTargetCircle.m_t0.Play();
+        }
+        private void CircleScoreEnd()
+        {
+            _index++;
+            if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-                int itemID = equipDatas[_index];
-                _score += DressUpMenuItemDataManager.GetItemScore(itemID);
-                _ui.m_selfScore.m_txtScore.text = "" + _score;
-                _index++;
-                int targetScore = (int)Math.Floor((double)_targetScore*(_index + 1)/(len + 1));
-                _ui.m_targetScore.m_txtScore.text = "" + targetScore;
+                Timers.inst.Add(0.5f, 1, Skip);
             }
             else
             {
-                _ui.m_selfScore.m_txtScore.text = "" + EquipDataCache.cacher.score;
-                _ui.m_targetScore.m_txtScore.text = "" + _targetScore;
-                Timers.inst.Remove(UpdateScore);
-                Timers.inst.Add(0.5f, 1, Skip);
+                Timers.inst.Add(0.5f, 1, (param) =>
+                {
+                    CircleScoreStart(null);
+                });//评分结束
+            }
+        }
+        private void ReleaseNpcSkill()
+        {
+            if (_npcSkillDic.ContainsKey(_index))
+            {
+                SetSkillValue(_npcSkillDic[_index], SkillDataManager.NPC);
+            }
+        }
+
+        /***************************************************主动技能**************************************************/
+
+        private void OnBtnSkillClick(GComponent obj)
+        {
+            UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
+            RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
+
+            SetCdState(item.m_proCD, cfg.cd);
+            SetSkillValue(cfg, SkillDataManager.MINE);
+        }
+        private void SetCdState(GProgressBar bar, float time)
+        {
+            bar.visible = true;
+            bar.value = 100;
+            bar.TweenValue(0, time).OnComplete(() => { bar.visible = false; });
+        }
+
+        private void SetSkillValue(RoleSkillCfg cfg, int role)
+        {
+            if (cfg.buff == SkillDataManager.SKILL_ADD)
+            {
+                UpdateAddUI(cfg, role);
+            }
+            else if (cfg.buff == SkillDataManager.SKILL_MINUS)
+            {
+                UpdateMinusUI(cfg, role);
+            }
+            else if (cfg.buff == SkillDataManager.SKILL_BREAK)
+            {
+                UpdateBreakUI(cfg, role);
+            }
+            else if (cfg.buff == SkillDataManager.SKILL_SHIELD)
+            {
+                UpdateShieldUI(cfg, role);
+            }
+
+        }
+        private void UpdateAddUI(RoleSkillCfg cfg, int role)
+        {
+            UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+            comRoleSkillScore.m_c1.selectedIndex = 0;
+            int score = 0;
+            if (role == SkillDataManager.MINE)
+            {
+                score = (int)_mainScore * cfg.value / 100;
+                _score += score;
             }
+            else
+            {
+                score = (int)_targetMainScore * cfg.value / 100;
+                _targetScore += score;
+            }
+            comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+            comRoleSkillScore.m_t0.Play();
+
+            UpdateProgressBar();
+
+        }
+
+        //荆钗效果
+        private void UpdateMinusUI(RoleSkillCfg cfg, int role)
+        {
+            UI_ComSkillMinus comSkillMinus = role == SkillDataManager.MINE ? _ui.m_ComMinusMine : _ui.m_ComMinusNpc;
+            UI_ComSkillShield targetComSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldNpc : _ui.m_ComShieldMine;
+
+            comSkillMinus.target.visible = true;
+            comSkillMinus.m_proMinus.target.value = 0;
+            comSkillMinus.m_proMinus.target.TweenValue(100, 2f).OnComplete(() =>
+            {
+                comSkillMinus.target.visible = false;
+                if (targetComSkillShield.target.visible)
+                {
+                    targetComSkillShield.target.visible = false;
+                    return;
+                }
+
+                UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
+
+                int score = 0;
+                if (role == SkillDataManager.MINE)
+                {
+                    score = (int)_targetMainScore * cfg.value / 100;
+                    _targetScore -= score;
+
+                }
+                else
+                {
+                    score = (int)_mainScore * cfg.value / 100;
+                    _score -= score;
+                }
+
+                comRoleSkillScore.m_c1.selectedIndex = 1;
+                comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+                comRoleSkillScore.m_t0.Play();
+
+                UpdateProgressBar();
+
+            });
+        }
+        private void UpdateBreakUI(RoleSkillCfg cfg, int role)
+        {
+
+            UI_ComSkillMinus targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_ComMinusNpc : _ui.m_ComMinusMine;
+            targetSkillMinus.target.visible = false;
+
+            GTweener twener = GTween.GetTween(targetSkillMinus.m_proMinus, TweenPropType.Progress);
+            if (twener != null)
+            {
+                twener.Kill(true);
+            }
+        }
+        //锦衣效果
+        private void UpdateShieldUI(RoleSkillCfg cfg, int role)
+        {
+            UI_ComSkillShield comSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldMine : _ui.m_ComShieldNpc;
+            comSkillShield.target.visible = true;
+
+            Timers.inst.Add(cfg.duration, 1, (param) => { comSkillShield.target.visible = false; });
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            _npcSkillDic.Clear();
         }
 
         private void Skip(object param = null)
         {
-            Timers.inst.Remove(UpdateScore);
+            Timers.inst.Remove((param) =>
+          {
+              CircleScoreStart(null);
+          });
+
             Timers.inst.Remove(Skip);
             this.Hide();
             ViewManager.Show(ViewName.STORY_FIGHT_RESULT_VIEW);
         }
-
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -20,7 +20,7 @@ namespace GFGGame
             base.OnShown();
             CardData data = CardDataManager.GetCardDicByRarity(0)[StoryDataManager.currentCardId];
             _ui.m_comSkillCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(data.res);
-            SkillScoreCfg cfg = ScoreSystemData.Instance.GetMainSkillCfg(data.id);
+            PassivitySkillCfg cfg = ScoreSystemData.Instance.GetMainSkillCfg(data.id);
             _ui.m_ComSkillName.target.GetChild("txtName").asTextField.text = cfg.name;
             _ui.m_ComSkillScore.target.GetChild("txtCount").asTextField.text = Math.Round((double)viewData).ToString();
             _ui.m_t0.Play(() =>

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -56,7 +56,7 @@ namespace GFGGame
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             bool hasFightTarget = fightCfg.targetName != null && fightCfg.targetName.Length > 0;
 
-            int score = hasFightTarget ? EquipDataCache.cacher.score : EquipDataCache.cacher.totalScore;
+            int score = EquipDataCache.cacher.totalScore;
             SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
             _ui.m_selfScore.m_txtScore.text = "" + score;
             _ui.m_expBar.m_txtLvl.text = "" + RoleDataManager.lvl;
@@ -64,22 +64,12 @@ namespace GFGGame
             _ui.m_expBar.m_pbExp.max = roleLevelCfg.exp;
             _ui.m_expBar.m_pbExp.value = RoleDataManager.exp;
 
-            bool equipedNeeded = EquipDataCache.cacher.CheckEquipedFightNeeded();
-
-            int starCount = 0;
-            if (equipedNeeded)
-            {
-                starCount = StoryDataManager.GetResultStarCount(score);
-                StoryDataManager.SetScore(score, starCount);
-            }
-            else
-            {
-                PromptController.Instance.ShowFloatTextPrompt("未穿必需物品");
-            }
+            bool resule = GetFightResult();
+            int starCount = !resule ? 0 : StoryDataManager.GetResultStarCount(score);
             StoryUtil.UpdateStar(starCount, _ui.m_selfScore.m_flower.target);
             _ui.m_selfScore.m_bg.url = "ui://Main/zd_jsjm_jszi_" + starCount;
             TextFormat tf = _ui.m_selfScore.m_txtScore.textFormat;
-            if (starCount <= 0)
+            if (!resule)
             {
                 tf.font = "ui://Main/Font3";
                 _ui.m_expBar.m_txtLvlAdded.text = "0";
@@ -102,6 +92,32 @@ namespace GFGGame
             _ui.m_selfScore.m_txtScore.textFormat = tf;
         }
 
+        private bool GetFightResult()
+        {
+            bool equipedNeeded = EquipDataCache.cacher.CheckEquipedFightNeeded();
+            if (!equipedNeeded)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未穿必需物品");
+                return false;//没穿必需品
+            }
+
+            int starCount = StoryDataManager.GetResultStarCount(EquipDataCache.cacher.totalScore);
+            StoryDataManager.SetScore(EquipDataCache.cacher.totalScore, starCount);
+            if (starCount <= 0)
+            {
+                return false;//低于一星
+            }
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(StoryDataManager.currentLevelID);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            bool hasFightTarget = fightCfg.targetName != null && fightCfg.targetName.Length > 0;
+            if (hasFightTarget && EquipDataCache.cacher.totalScore < EquipDataCache.cacher.npcTotalScore)
+            {
+                return false;//分数低于对战对象
+            }
+
+            return true;
+        }
         protected override void OnHide()
         {
             base.OnHide();