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

# Conflicts:
#	GameClient/Assets/Game/CSShare

FGUIProject/assets/CommonGame/FunctionOpenUI.xml

@@ -2,6 +2,7 @@
 <component size="482,482">
   <displayList>
     <component id="n0_g3nf" name="ComFunctionOpen" src="eiwu9v" fileName="ComFunctionOpen.xml" xy="0,0" pivot="0.5,0.5"/>
+    <graph id="n1_o139" name="holder" xy="240,240" size="1,1"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n0_g3nf" tween="true" startValue="0,0" endValue="1,1" duration="3" ease="Linear"/>

FGUIProject/assets/Guide/components/Component1.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="700,200" restrictSize="0,0,200,0">
+<component size="690,126" restrictSize="0,0,200,0">
   <displayList>
-    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="0,-11" size="716,212">
-      <relation target="" sidePair="rightext-right,topext-top,bottomext-bottom,leftext-left"/>
-    </image>
-    <text id="n18_tu96" name="txt" xy="55,29" size="594,144" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="点击继续">
-      <relation target="" sidePair="rightext-right,topext-top,bottomext-bottom,leftext-left"/>
-    </text>
+    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="0,1"/>
+    <text id="n18_tu96" name="txt" xy="100,16" size="489,97" fontSize="30" color="#9b7853" autoSize="none" autoClearText="true" text="点击继续"/>
+    <image id="n19_o139" name="n19" src="o139g" fileName="images/yd_tykuang_3.png" xy="-72,-55"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/package.xml

@@ -5,11 +5,12 @@
     <image id="ga167" name="yd_tsbq.png" path="/images/"/>
     <component id="ga169" name="ArrowRight.xml" path="/animations/"/>
     <component id="ga16a" name="ArrowLeft.xml" path="/animations/"/>
-    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="8,52,37,21"/>
+    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="7,32,213,61"/>
     <image id="tu96c" name="yd_tykuang_2.png" path="/images/" scale="9grid" scale9grid="25,25,50,50"/>
     <component id="tu96d" name="Component1.xml" path="/components/"/>
     <component id="tu96e" name="Component2.xml" path="/components/"/>
     <component id="tu96f" name="Component3.xml" path="/components/"/>
+    <image id="o139g" name="yd_tykuang_3.png" path="/images/"/>
   </resources>
   <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -235,7 +235,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.TARGET_FIGHT_GUIDE;
-                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, true, devWidth, devHeight);
+                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, false, devWidth, devHeight);
             }
         }
         public static void TryGuideStoryFightTargetScorebtnSkill0(GObject target)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_FunctionOpenUI.cs

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public UI_ComFunctionOpen m_ComFunctionOpen;
+        public GGraph m_holder;
         public Transition m_t0;
         public const string URL = "ui://eg2y0ldpg3nf9r";
         public const string PACKAGE_NAME = "CommonGame";
@@ -57,12 +58,14 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_ComFunctionOpen = (UI_ComFunctionOpen)UI_ComFunctionOpen.Create(comp.GetChild("ComFunctionOpen"));
+            m_holder = (GGraph)comp.GetChild("holder");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ComFunctionOpen.Dispose();
             m_ComFunctionOpen = null;
+            m_holder = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/FunctionOpenView.cs

@@ -9,7 +9,8 @@ namespace GFGGame
     {
         private UI_FunctionOpenUI _ui;
         List<string> _funList = new List<string>();
-
+        private GameObject _effectObj;
+        private GoWrapper _wrapper;
         public override void Dispose()
         {
             base.Dispose();
@@ -32,9 +33,6 @@ namespace GFGGame
             List<string> funList = (viewData as object) as List<string>;
             AddFunDatas(funList);
             UpdateFunIcon();
-            // _ui.m_t0.Play(UpdateFunIcon);
-            // Timers.inst.Remove(UpdateFunIcon);
-            // Timers.inst.Add(1.5f, _funList.Count, UpdateFunIcon);
         }
 
         private void AddFunDatas(List<string> itemList)
@@ -54,6 +52,8 @@ namespace GFGGame
                 this.Hide();
                 return;
             }
+            // string resPath = ResPathUtil.GetDressUpAnimationPath("ui_xjs");
+            // SceneController.AddObjectToView(_effectObj, _wrapper, _ui.m_holder, resPath, out _effectObj, out _wrapper);
             FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(_funList[0]);
             _ui.m_ComFunctionOpen.m_txtName.text = cfg.name;
             _ui.m_ComFunctionOpen.m_logIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);

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

@@ -433,13 +433,13 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
             Reset();
             this.Hide();
             ViewManager.Show(ViewName.STORY_FIGHT_RESULT_VIEW);
         }
         private void Reset()
         {
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
 
             _ui.m_proScore.target.max = 100;
             _ui.m_proScore.target.value = 0;

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

@@ -92,8 +92,8 @@ namespace GFGGame
                 {
                     FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(StoryDataManager._passChapter + 1, StoryDataManager._passLevel);//首次通过要检查是否有功能开启
                 }
-                Timers.inst.Add(0.5f, 1, AddExp);
             }
+            Timers.inst.Add(0.5f, 1, AddExp);
             _ui.m_selfScore.m_txtScore.textFormat = tf;
         }
 
@@ -167,11 +167,11 @@ namespace GFGGame
             int targetY = (int)_ui.m_expBar.target.y - 250;
             int count = GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_RESULT_VIEW);
             string txt = null;
-            if (count == 0)
+            if (_curLvfirstPass && StoryDataManager._passChapter + 1 == 1 && StoryDataManager._passLevel == 2)
             {
                 txt = "这条连衣裙可真好看！点击空白区域继续";
             }
-            else
+            else if (_curLvfirstPass && StoryDataManager._passChapter + 1 == 1 && StoryDataManager._passLevel == 6)
             {
                 txt = "你太厉害了，初次对战就获得了这么好的战绩，继续加油吧";
             }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -2,6 +2,7 @@ using FairyGUI;
 using UI.Main;
 using UI.CommonGame;
 using UnityEngine;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -234,6 +235,10 @@ namespace GFGGame
                 isOpen = false;
 
             });
+            List<string> list = new List<string>();
+            list.Add("GFGGame.ClothingShopView");
+            list.Add("GFGGame.LuckyBoxView");
+            ViewManager.Show<FunctionOpenView>(list);
         }