登峰造极单人

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -3,6 +3,7 @@
   <displayList>
     <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
     <image id="n17_9jv6" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="74,491"/>
+    <component id="n9_9jv6" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
     <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">
       <Button title="排行榜"/>
     </component>
@@ -18,7 +19,6 @@
     <component id="n5_pvb4" name="btnAnswer" src="pvb454" fileName="components/Button121.xml" xy="446,530">
       <Button title="开始答题"/>
     </component>
-    <component id="n9_9jv6" name="n9" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
     <text id="n15_9jv6" name="n15" xy="388,140" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#a9733e" text="玩法描述"/>
     <image id="n16_9jv6" name="n16" src="9jv663" fileName="images/lm_zhuangshixian_2.png" xy="377,192"/>
   </displayList>

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -12,7 +12,7 @@
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
-  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="1">
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="0">
     <remark page="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
@@ -35,7 +35,7 @@
     <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="663,718" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
+    <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
     </text>
     <image id="n38_9jv6" name="n38" src="9jv66o" fileName="images/lm_djs_db.png" xy="935,0" group="n15_pvb4"/>
@@ -66,7 +66,7 @@
       <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
     </group>
     <image id="n41_9jv6" name="n41" src="9jv65k" fileName="images/lm_dt_tsdb.png" xy="15,664" group="n42_9jv6"/>
-    <text id="n40_9jv6" name="txtRightCount1" xy="58,667" size="184,42" group="n42_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" letterSpacing="-2" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题"/>
+    <text id="n40_9jv6" name="txtRightCount1" xy="58,667" size="184,41" group="n42_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" letterSpacing="-2" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题"/>
     <group id="n42_9jv6" name="n42" xy="15,664" size="290,87" group="n15_pvb4"/>
     <image id="n43_9jv6" name="n43" src="9jv66w" fileName="images/lm_dt_icon_db.png" xy="68,252" group="n44_9jv6"/>
     <loader id="n12_pvb4" name="loaIocn" xy="67,254" pivot="0.5,0.5" size="280,280" group="n44_9jv6" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>

FGUIProject/assets/League/components/ListChatItem.xml

@@ -12,7 +12,7 @@
     <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="367,84" group="n38_9jv6">
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
     </image>
-    <text id="n34_pvb4" name="txtChatContent" xy="139,66" size="318,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" letterSpacing="-2" autoClearText="true" text="玩家发言内容玩家发言内容&#xD;&#xA;玩家发言内容玩家"/>
+    <text id="n34_pvb4" name="txtChatContent" xy="145,66" size="318,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" letterSpacing="-2" autoClearText="true" text="玩家发言内容玩家发言内容&#xD;&#xA;玩家发言内容玩家"/>
     <group id="n38_9jv6" name="n38" xy="113,62" size="367,84"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>

FGUIProject/assets/League/components/ListChatItemMine.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="491,150">
+<component size="491,116">
   <displayList>
     <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="321,-57" pivot="0.5,0.5" group="n41_miy3" scale="0.5,0.5">
       <relation target="" sidePair="right-right"/>
@@ -9,14 +9,14 @@
     <group id="n37_pvb4" name="n37" xy="82,24" size="288,35" group="n41_miy3" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <image id="n35_pvb4" name="n35" src="9jv66u" fileName="images/lm_dt_dhdk2.png" xy="5,69" size="372,80" group="n38_9jv6">
+    <image id="n35_pvb4" name="n35" src="9jv66u" fileName="images/lm_dt_dhdk2.png" xy="9,69" pivot="1,0" size="368,46" group="n38_9jv6">
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
     </image>
-    <text id="n34_pvb4" name="txtChatContent" xy="28,74" pivot="1,0" size="322,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" letterSpacing="-2" autoSize="none" text="玩家发言内容玩家发言内容 玩家发言内容玩家"/>
-    <group id="n38_9jv6" name="n38" xy="5,69" size="372,80" group="n41_miy3" advanced="true">
+    <text id="n34_pvb4" name="txtChatContent" xy="30,74" pivot="1,0" size="318,39" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" letterSpacing="-2" text="玩家发言内容玩家发言内容"/>
+    <group id="n38_9jv6" name="n38" xy="9,69" size="368,46" group="n41_miy3" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <group id="n41_miy3" name="n41" xy="5,-57" size="546,230"/>
+    <group id="n41_miy3" name="n41" xy="9,-57" size="542,230"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/package.xml

@@ -130,8 +130,8 @@
     <component id="pvb453" name="LeagueAnsweringUI.xml" path="/" exported="true"/>
     <component id="pvb454" name="Button121.xml" path="/components/"/>
     <component id="pvb455" name="ListAnswerJoinItem.xml" path="/components/"/>
-    <component id="pvb456" name="ListChatItem.xml" path="/components/"/>
-    <component id="pvb457" name="ListChatItemMine.xml" path="/components/"/>
+    <component id="pvb456" name="ListChatItem.xml" path="/components/" exported="true"/>
+    <component id="pvb457" name="ListChatItemMine.xml" path="/components/" exported="true"/>
     <component id="pvb458" name="LeagueAnswerRewardUI.xml" path="/" exported="true"/>
     <component id="pvb459" name="ListAnswerRewardItem.xml" path="/components/"/>
     <component id="pvb45a" name="LeagueSkillUI.xml" path="/" exported="true"/>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -15,6 +15,5 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <component id="n54_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="367,963"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="345,367">
   <displayList>
-    <text id="n38_qgxy" name="txtCount" xy="3,135" pivot="0.5,0.5" size="339,97" visible="false" font="ui://mfvz4q8kqkjsnw" fontSize="40" text="66666"/>
     <graph id="n42_gfx4" name="holderLoop" xy="172,183" size="1,1" visible="false"/>
     <graph id="n43_gfx4" name="holder" xy="172,183" size="1,1" visible="false"/>
     <graph id="n44_gfx4" name="holderSmokeIn" xy="172,183" size="1,1" visible="false"/>
     <graph id="n45_gfx4" name="holderSmokeOut" xy="172,183" size="1,1" visible="false"/>
+    <text id="n38_qgxy" name="txtCount" xy="-43,96" pivot="0.5,0.5" size="419,121" visible="false" font="ui://mfvz4q8kqkjsnw" fontSize="50" text="66666"/>
+    <image id="n47_fqor" name="img3Second" src="9jv6o2" fileName="imagesNew/3Second.png" xy="-202,545"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n38_qgxy" value="false"/>
     <item time="0" type="Visible" target="n42_gfx4" value="true"/>
-    <item time="0" type="Visible" target="n43_gfx4" value="true"/>
     <item time="0" type="Visible" target="n44_gfx4" value="false"/>
     <item time="0" type="Visible" target="n45_gfx4" value="false"/>
+    <item time="6" type="Visible" target="n43_gfx4" value="true"/>
+    <item time="36" type="Visible" target="n43_gfx4" value="true"/>
   </transition>
   <transition name="t1">
+    <item time="0" type="Visible" target="n43_gfx4" value="false"/>
     <item time="0" type="Visible" target="n44_gfx4" value="true"/>
-    <item time="0" type="Visible" target="n45_gfx4" value="false"/>
-    <item time="72" type="Visible" target="n44_gfx4" value="false"/>
-    <item time="72" type="Visible" target="n45_gfx4" value="true"/>
-    <item time="78" type="Scale" target="n38_qgxy" tween="true" startValue="1,1" endValue="1.2,1.2" duration="6" ease="Linear"/>
-    <item time="78" type="Visible" target="n38_qgxy" value="true"/>
-    <item time="84" type="Scale" target="n38_qgxy" tween="true" startValue="1.2,1.2" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="72" type="Visible" target="n44_gfx4" value="true"/>
   </transition>
   <transition name="t2">
-    <item time="0" type="Scale" target="n38_qgxy" tween="true" startValue="1,1" endValue="1.3,1.3" duration="6" ease="Linear"/>
     <item time="0" type="Visible" target="n44_gfx4" value="false"/>
     <item time="0" type="Visible" target="n45_gfx4" value="true"/>
-    <item time="6" type="Scale" target="n38_qgxy" tween="true" startValue="1.3,1.3" endValue="1,1" duration="6" ease="Linear"/>
-    <item time="12" type="Visible" target="n42_gfx4" value="false"/>
-    <item time="12" type="Visible" target="n43_gfx4" value="false"/>
-    <item time="12" type="Visible" target="n44_gfx4" value="false"/>
-    <item time="12" type="Visible" target="n45_gfx4" value="false"/>
+    <item time="18" type="Scale" target="n38_qgxy" tween="true" startValue="1,1" endValue="1.3,1.3" duration="5" ease="Linear"/>
+    <item time="18" type="Visible" target="n38_qgxy" value="true"/>
+    <item time="23" type="Scale" target="n38_qgxy" tween="true" startValue="1.3,1.3" endValue="1,1" duration="5" ease="Linear"/>
+    <item time="28" type="Scale" target="n38_qgxy" tween="true" startValue="1,1" endValue="1,1" duration="26" ease="Linear"/>
+    <item time="30" type="Visible" target="n45_gfx4" value="false"/>
+    <item time="54" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="54" type="Visible" target="n42_gfx4" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ComClick.xml

@@ -11,5 +11,6 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n51_f2bf" name="comResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="143,489" visible="false"/>
+    <component id="n53_fqor" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="367,776"/>
   </displayList>
 </component>

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

@@ -15,5 +15,25 @@ namespace GFGGame
             ChatDatas.Clear();
             PrivateChatDatas.Clear();
         }
+
+        public List<ChatData> GetChatDatas(long type)
+        {
+            if (type == ChatType.Private)
+            {
+                if (!PrivateChatDatas.ContainsKey(type))
+                {
+                    PrivateChatDatas[type] = new List<ChatData>();
+                }
+                return PrivateChatDatas[type];
+            }
+            else
+            {
+                if (!ChatDatas.ContainsKey((int)type))
+                {
+                    ChatDatas[(int)type] = new List<ChatData>();
+                }
+                return ChatDatas[(int)type];
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerUI.cs

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeagueAnswerUI
     {
         public GComponent target;
+        public GButton m_btnClose;
         public GButton m_btnRank;
         public UI_ComHeadIcon m_comHead;
         public GTextField m_txtName;
@@ -60,6 +61,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRank = (GButton)comp.GetChild("btnRank");
             m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -69,6 +71,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnClose = null;
             m_btnRank = null;
             m_comHead.Dispose();
             m_comHead = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItemMine.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListChatItemMine
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GLoader m_loaTitle;
+        public GTextField m_txtName;
+        public GTextField m_txtChatContent;
+        public const string URL = "ui://tw70qm9dpvb457";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListChatItemMine";
+        private static UI_ListChatItemMine _proxy;
+
+        public static UI_ListChatItemMine Create(GObject gObject = null)
+        {
+            var ui = new UI_ListChatItemMine();
+            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_ListChatItemMine Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListChatItemMine();
+            }
+            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_comHead = (GComponent)comp.GetChild("comHead");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_loaTitle = null;
+            m_txtName = null;
+            m_txtChatContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItemMine.cs.meta

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

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

@@ -7,11 +7,12 @@ namespace UI.Main
     public partial class UI_ComAllPerfect
     {
         public GComponent target;
-        public GTextField m_txtCount;
         public GGraph m_holderLoop;
         public GGraph m_holder;
         public GGraph m_holderSmokeIn;
         public GGraph m_holderSmokeOut;
+        public GTextField m_txtCount;
+        public GImage m_img3Second;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_t2;
@@ -62,22 +63,24 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderSmokeOut = (GGraph)comp.GetChild("holderSmokeOut");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_img3Second = (GImage)comp.GetChild("img3Second");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtCount = null;
             m_holderLoop = null;
             m_holder = null;
             m_holderSmokeIn = null;
             m_holderSmokeOut = null;
+            m_txtCount = null;
+            m_img3Second = null;
             m_t0 = null;
             m_t1 = null;
             m_t2 = null;

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

@@ -14,6 +14,7 @@ namespace UI.Main
         public GGraph m_grh_4;
         public GGraph m_grh_5;
         public UI_ComScoreResult m_comResult;
+        public UI_ComAllPerfect m_comAllPerfect;
         public const string URL = "ui://mfvz4q8kpsphj5";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComClick";
@@ -68,6 +69,7 @@ namespace UI.Main
             m_grh_4 = (GGraph)comp.GetChild("grh_4");
             m_grh_5 = (GGraph)comp.GetChild("grh_5");
             m_comResult = (UI_ComScoreResult)UI_ComScoreResult.Create(comp.GetChild("comResult"));
+            m_comAllPerfect = (UI_ComAllPerfect)UI_ComAllPerfect.Create(comp.GetChild("comAllPerfect"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,6 +81,8 @@ namespace UI.Main
             m_grh_5 = null;
             m_comResult.Dispose();
             m_comResult = null;
+            m_comAllPerfect.Dispose();
+            m_comAllPerfect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,7 +11,6 @@ namespace UI.Main
         public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
-        public UI_ComAllPerfect m_comAllPerfect;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -63,7 +62,6 @@ namespace UI.Main
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
-            m_comAllPerfect = (UI_ComAllPerfect)UI_ComAllPerfect.Create(comp.GetChild("comAllPerfect"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,8 +71,6 @@ namespace UI.Main
             m_proScore.Dispose();
             m_proScore = null;
             m_btnSpeedUp = null;
-            m_comAllPerfect.Dispose();
-            m_comAllPerfect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/ChatSProxy.cs

@@ -14,13 +14,37 @@ namespace ET
             chatData.TargetId = chatData.RoleInfo.roleId;
             chatData.Content = message.Content;
             chatData.Time = message.Time;
-            if (message.Type == ChatType.Private)
+            // if (message.Type == ChatType.Private)
+            // {
+            //     if (!ChatDataManager.Instance.PrivateChatDatas.ContainsKey(chatData.TargetId))
+            //     {
+            //         ChatDataManager.Instance.PrivateChatDatas[chatData.TargetId] = new List<ChatData>();
+            //     }
+            //     ChatDataManager.Instance.PrivateChatDatas[chatData.TargetId].Add(chatData);
+            //     if (response.ChatMsgs[i].Type == ChatType.Private)
+            //     {
+            //         ChatDataManager.Instance.GetChatDatas(chatData.TargetId).Add(chatData);
+            //     }
+            //     else
+            //     {
+            //         ChatDataManager.Instance.GetChatDatas(chatData.Type).Add(chatData);
+            //     }
+            // }
+            // else
+            // {
+            //     if (!ChatDataManager.Instance.PrivateChatDatas.ContainsKey(chatData.Type))
+            //     {
+            //         ChatDataManager.Instance.PrivateChatDatas[chatData.Type] = new List<ChatData>();
+            //     }
+            //     ChatDataManager.Instance.PrivateChatDatas[chatData.Type].Add(chatData);
+            // }
+            if (chatData.Type == ChatType.Private)
             {
-                ChatDataManager.Instance.PrivateChatDatas[chatData.TargetId].Add(chatData);
+                ChatDataManager.Instance.GetChatDatas(chatData.TargetId).Add(chatData);
             }
             else
             {
-                ChatDataManager.Instance.PrivateChatDatas[chatData.Type].Add(chatData);
+                ChatDataManager.Instance.GetChatDatas(chatData.Type).Add(chatData);
             }
             EventAgent.DispatchEvent(ConstMessage.NOTICE_CHAT_MESSAGE);
             await ETTask.CompletedTask;
@@ -66,11 +90,11 @@ namespace GFGGame
                         chatData.Time = response.ChatMsgs[i].Time;
                         if (response.ChatMsgs[i].Type == ChatType.Private)
                         {
-                            ChatDataManager.Instance.PrivateChatDatas[chatData.TargetId].Add(chatData);
+                            ChatDataManager.Instance.GetChatDatas(chatData.TargetId).Add(chatData);
                         }
                         else
                         {
-                            ChatDataManager.Instance.ChatDatas[chatData.Type].Add(chatData);
+                            ChatDataManager.Instance.GetChatDatas(chatData.Type).Add(chatData);
                         }
                     }
                     return true;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnRank.onClick.Add(OnBtnRankClick);
             _ui.m_btnAnswer.onClick.Add(OnBtnAnswerClick);
         }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
@@ -58,13 +58,14 @@ namespace GFGGame
         {
             base.OnShown();
             _dataManager = LeagueDataManager.Instance;
-            _ui.m_listChat.numItems = ChatDataManager.Instance.ChatDatas.ContainsKey(ChatType.LeagueQuestion) ? ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion].Count : 0;
+            _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
             _ui.m_listChat.scrollPane.ScrollBottom();
             UpdateQuestionState();
             bool result = await LeagueSproxy.ReqJoinAnswer();
             if (result)
             {
                 UpdateJoinList();
+                UpdateChatList();
             }
         }
 
@@ -206,7 +207,7 @@ namespace GFGGame
         }
         private void UpdateChatList()
         {
-            _ui.m_listChat.numItems = ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion].Count;
+            _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
             _ui.m_listChat.scrollPane.ScrollBottom(true);
         }
         private void RenderListResultItem(int index, GObject obj)
@@ -267,6 +268,12 @@ namespace GFGGame
 
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
             item.m_txtName.text = roleInfo.roleName;
+            string content = "";
+            for (int i = 0; i < chatData.Content.Length; i++)
+            {
+                string str = i == 12 * (i + 1) ? chatData.Content[i] + "/n" : chatData.Content[i].ToString();
+                content += str;
+            }
             item.m_txtChatContent.text = chatData.Content;
 
             UI_ListChatItem.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 namespace GFGGame
 {
     //联盟
-    public class LeagueView : BaseWindow
+    public class LeagueView : BaseView
     {
         private UI_LeagueUI _ui;
 

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

@@ -40,6 +40,10 @@ namespace GFGGame
         private GameObject _gameObject10;
         private GameObject _gameObject11;
         private GameObject _gameObject12;
+        private GameObject _gameObject13;
+        private GameObject _gameObject14;
+        private GameObject _gameObject15;
+        private GameObject _gameObject16;
 
         private GoWrapper _wrapper0;
         private GoWrapper _wrapper1;
@@ -55,6 +59,10 @@ namespace GFGGame
         private GoWrapper _wrapper10;
         private GoWrapper _wrapper11;
         private GoWrapper _wrapper12;
+        private GoWrapper _wrapper13;
+        private GoWrapper _wrapper14;
+        private GoWrapper _wrapper15;
+        private GoWrapper _wrapper16;
 
 
         public override void Dispose()
@@ -78,6 +86,10 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject10, _wrapper10);
             SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
             SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
+            SceneController.DestroyObjectFromView(_gameObject13, _wrapper13);
+            SceneController.DestroyObjectFromView(_gameObject14, _wrapper14);
+            SceneController.DestroyObjectFromView(_gameObject15, _wrapper15);
+            SceneController.DestroyObjectFromView(_gameObject16, _wrapper16);
 
             if (_ui != null)
             {
@@ -100,10 +112,13 @@ namespace GFGGame
 
             _ui.m_comClick.target.onClick.Add(CheckPerfectSkill);
             _ui.m_comClick.target.onTouchBegin.Add(OnComAllCircleClickBegin);
-            _ui.m_comClick.target.onTouchEnd.Add(OnComAllCircleClickBegin);
+            _ui.m_comClick.target.onTouchEnd.Add(AllCircleScoreEnd);
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             // _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
+            _ui.m_comClick.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
+            _ui.m_comClick.m_comAllPerfect.m_t1.ignoreEngineTimeScale = false;
+            _ui.m_comClick.m_comAllPerfect.m_t2.ignoreEngineTimeScale = false;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
             AddEffect();
@@ -141,6 +156,15 @@ namespace GFGGame
             string resPath12 = ResPathUtil.GetViewEffectPath("ui_fight_new", "botton_Highlight");
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderHigh, resPath12, out _gameObject12, out _wrapper12);
 
+            string resPath13 = ResPathUtil.GetViewEffectPath("ui_fight_new", "loop_tx");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderLoop, resPath13, out _gameObject13, out _wrapper13);
+            string resPath14 = ResPathUtil.GetViewEffectPath("ui_fight_new", "3S_textAppear01");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holder, resPath14, out _gameObject14, out _wrapper14);
+            string resPath15 = ResPathUtil.GetViewEffectPath("ui_fight_new", "smoke_Approach");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, resPath15, out _gameObject15, out _wrapper15);
+            string resPath16 = ResPathUtil.GetViewEffectPath("ui_fight_new", "smoke_out");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, resPath16, out _gameObject16, out _wrapper16);
+
 
         }
         protected override void AddEventListener()
@@ -176,7 +200,7 @@ namespace GFGGame
 
             _ui.m_proScore.m_txtCount.text = "总分 0";
             _ui.m_comClick.target.touchable = false;
-            _ui.m_comAllPerfect.target.visible = false;
+            _ui.m_comClick.m_comAllPerfect.target.visible = false;
             _isAllPerfect = false;
 
             _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
@@ -185,11 +209,11 @@ namespace GFGGame
             _score = 0;
             _skillScore = 0;//技能附加分
             _mainScore = ScoreSystemData.Instance.GetMainScore(roleData);
-            if (!FightDataManager.Instance.autoPlay)
-            {
-                _ui.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
-                _ui.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
-            }
+            // if (!FightDataManager.Instance.autoPlay)
+            // {
+            //     _ui.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
+            //     _ui.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
+            // }
             Timers.inst.Add(0.5f, 1, SkillScoreStart);//评分结束
         }
 
@@ -271,22 +295,18 @@ namespace GFGGame
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
 
-            if (!_isAllPerfect)
+            if (_isAllPerfect) return;
+
+            if (clickType == ClickType.PREFACT_CLICK)
             {
-                if (clickType == ClickType.PREFACT_CLICK)
-                {
-                    _currentTime = BeginTime.PART_PREFACT_CLICK;
-                    SkillScoreStart(null);
-                }
-                else
-                {
-                    PartScoreResultStart(clickType);
-                }
+                _currentTime = BeginTime.PART_PREFACT_CLICK;
+                SkillScoreStart(null);
             }
             else
             {
-                OnComAllCircleClickBegin();
+                PartScoreResultStart(clickType);
             }
+
         }
         private void PartScoreResultStart(int clickType)
         {
@@ -357,15 +377,13 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_prefectCount > FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
+                if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= 0)//  FightScoreCfgArray.Instance.dataArray.Length)// 
                 {
-                    _ui.m_comAllPerfect.target.visible = true;
                     AllCirclePlayStart();//完美八连击
                 }
                 else
                 {
-                    // Timers.inst.Add(0.5f, 1, FightEnd);//评分结束
-                    Timers.inst.Add(0.3f, 1, Skip);
+                    Timers.inst.Add(0.3f, 1, Skip);//评分结束
                 }
             }
             else
@@ -374,32 +392,31 @@ namespace GFGGame
             }
         }
 
-        private void FightEnd(object param = null)
-        {
-
-            // _ui.m_t1.Play(() =>
-            // {
-            //     Timers.inst.Add(0.3f, 1, Skip);
-            // });
-        }
-
         private void AllCirclePlayStart()
         {
             //登峰造极评分开始
             _isAllPerfect = true;
-            _ui.m_comAllPerfect.target.visible = true;
-            _ui.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
-            _ui.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
-            _ui.m_comAllPerfect.m_t0.Play();
+            _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
+            _ui.m_comClick.m_comAllPerfect.target.visible = true;
+            _ui.m_comClick.m_comAllPerfect.m_img3Second.visible = !FightDataManager.Instance.autoPlay;
+
+            _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
+            if (FightDataManager.Instance.autoPlay)
+            {
+                _ui.m_comClick.m_comAllPerfect.m_t0.Play(OnComAllCircleClickBegin);
+            }
+            else
+            {
+                _ui.m_comClick.m_comAllPerfect.m_t0.Play();
+            }
         }
         private void OnComAllCircleClickBegin()
         {
-            // if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
-            // {
-            //     Timers.inst.Remove(ComAllCirclePressTime);
-            // }
-            // else
-            // {
+
+            if (!_isAllPerfect) return;
+            _ui.m_comClick.m_comAllPerfect.m_t0.Stop(true, false);
+            _ui.m_comClick.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
+            _ui.m_comClick.m_comAllPerfect.m_t1.Play(AllCircleScoreEnd);
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
             // }
         }
@@ -410,21 +427,22 @@ namespace GFGGame
         }
         private void AllCircleScoreEnd()
         {
+            if (!_isAllPerfect) return;
+            _isAllPerfect = false;
+            _ui.m_comClick.m_comAllPerfect.m_t1.Stop(true, false);
             Timers.inst.Remove(ComAllCirclePressTime);
-            _ui.m_comAllPerfect.m_t0.Stop();
-            _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
-            _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
 
             int allCircleScore = 0;
             if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || FightDataManager.Instance.autoPlay)
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
-            _ui.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
-
+            _ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+            _ui.m_comClick.m_comResult.target.visible = false;
+            // _ui.m_comClick.m_comResult.target.SetXY(_ui.m_comClick.m_comAllPerfect.target.x, _ui.m_comClick.m_comAllPerfect.target.y);
             _time = 0;
             _score += allCircleScore;
-            _ui.m_comAllPerfect.m_t1.Play(() =>
+            _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
                     _prefectCount = 0;
                     UpdateProgress();
@@ -474,8 +492,11 @@ namespace GFGGame
         }
         private void Reset()
         {
+            Timers.inst.Remove(ComAllCirclePressTime);
             Timers.inst.Remove(SkillScoreStart);
             Timers.inst.Remove(Skip);
+            Timers.inst.Remove(CheckPartBeginSkill);
+
             GTween.Kill(_ui.m_proScore.m_comBar);
 
             _ui.m_proScore.target.value = 0;
@@ -485,10 +506,11 @@ namespace GFGGame
             _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = 0;
             _ui.m_proScore.m_comThirdScore.m_c1.selectedIndex = 0;
 
-            _ui.m_comAllPerfect.m_t0.Stop(true, false);
-            _ui.m_comAllPerfect.m_t1.Stop(true, false);
-            _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
-            _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
+            _ui.m_comClick.m_comAllPerfect.m_t0.Stop(true, false);
+            _ui.m_comClick.m_comAllPerfect.m_t1.Stop(true, false);
+            _ui.m_comClick.m_comAllPerfect.m_t2.Stop(true, false);
+            // _ui.m_comClick.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
+            // _ui.m_comClick.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
 
             _ui.m_comClick.m_comResult.m_t1.Stop(true, false);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -35,6 +35,10 @@ namespace GFGGame
             _ui.m_ComBtn.m_btnAll.onClick.Add(OnClickBtnAll);
             _ui.m_ComBtn.m_btnArenaGrade.onClick.Add(OnClickBtnArenaGrade);
             _ui.m_ComBtn.m_btnLeagueSkill.onClick.Add(OnClickBtnLeagueSkill);
+            _ui.m_ComBtn.m_btnAnswerStart.onClick.Add(OnClickBtnStart);
+            _ui.m_ComBtn.m_btnAnswerEnd.onClick.Add(OnClickBtnEnd);
+            _ui.m_ComBtn.m_btnAnswerActiveEnd.onClick.Add(OnClickBtnActiveEnd);
+            _ui.m_ComBtn.m_btnLeagueSkill.onClick.Add(OnClickBtnLeagueSkill);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
         }
@@ -142,6 +146,18 @@ namespace GFGGame
             }
         }
 
+        private void OnClickBtnStart()
+        {
+            GMController.SendGMCommand("League|StartQuestion", "开始答题").Coroutine();
+        }
+        private void OnClickBtnEnd()
+        {
+            GMController.SendGMCommand("League|EndQuestion", "结束答题").Coroutine();
+        }
+        private void OnClickBtnActiveEnd()
+        {
+            GMController.SendGMCommand("League|CloseQuestion", "活动结束").Coroutine();
+        }
         private async void OnClickBtnLeagueSkill()
         {
             int _type = int.Parse(_ui.m_ComBtn.m_txtskillType.text);