Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/RoleInfo/components/ComBtn.xml

@@ -25,8 +25,8 @@
       <Button title="设置玩家章节" titleFontSize="30"/>
     </component>
     <text id="n18_lqp0" name="txtChapter" xy="333,245" size="44,42" group="n27_ysx9" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
-    <text id="n24_lqp0" name="n24" xy="454,246" size="34,42" group="n27_ysx9" fontSize="30" text="关"/>
-    <text id="n21_lqp0" name="n21" xy="377,245" size="34,42" group="n27_ysx9" fontSize="30" text="章"/>
+    <text id="n24_lqp0" name="n24" xy="454,246" size="34,41" group="n27_ysx9" fontSize="30" text="关"/>
+    <text id="n21_lqp0" name="n21" xy="377,245" size="34,41" group="n27_ysx9" fontSize="30" text="章"/>
     <text id="n19_lqp0" name="txtChapterLv" xy="411,245" size="42,42" group="n27_ysx9" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
     <group id="n27_ysx9" name="n27" xy="1,244" size="487,46" group="n28_ysx9" advanced="true">
       <gearDisplay controller="c1" pages="0,1"/>
@@ -39,35 +39,39 @@
     <group id="n40_u10a" name="n40" xy="0,305" size="482,46" group="n28_ysx9" advanced="true" layout="hz" colGap="2">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <component id="n41_gfx4" name="btnLeagueSkill" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,366" size="330,46" group="n44_gfx4">
-      <Button title="学习茶艺技能" titleFontSize="30"/>
-    </component>
-    <text id="n42_gfx4" name="txtskillType" xy="332,367" size="92,42" group="n44_gfx4" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#666666]第N层[/color]"/>
-    <group id="n44_gfx4" name="n44" xy="0,366" size="424,46" group="n28_ysx9" advanced="true" layout="hz" colGap="2">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <group id="n28_ysx9" name="n28" xy="0,0" size="488,412" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true"/>
-    <component id="n45_miy3" name="btnAnswerStart" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,426" size="139,46" group="n48_miy3">
+    <component id="n45_miy3" name="btnAnswerStart" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,366" size="139,46" group="n48_miy3">
       <Button title="答题开始" titleFontSize="30"/>
     </component>
-    <component id="n46_miy3" name="btnAnswerEnd" src="c5sc8h" fileName="components/ButtonGM.xml" xy="179,426" size="135,46" group="n48_miy3">
+    <component id="n46_miy3" name="btnAnswerEnd" src="c5sc8h" fileName="components/ButtonGM.xml" xy="179,366" size="135,46" group="n48_miy3">
       <Button title="答题结束" titleFontSize="30"/>
     </component>
-    <component id="n47_miy3" name="btnAnswerActiveEnd" src="c5sc8h" fileName="components/ButtonGM.xml" xy="354,427" size="145,46" group="n48_miy3">
+    <component id="n47_miy3" name="btnAnswerActiveEnd" src="c5sc8h" fileName="components/ButtonGM.xml" xy="354,367" size="145,46" group="n48_miy3">
       <Button title="活动结束" titleFontSize="30"/>
     </component>
-    <group id="n48_miy3" name="n48" xy="0,426" size="499,47" advanced="true" layout="hz" colGap="40" excludeInvisibles="true"/>
-    <component id="n60_y5mt" name="btnAddLeagueNum" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,492" size="166,46" group="n53_y5mt">
+    <group id="n48_miy3" name="n48" xy="0,366" size="499,47" group="n28_ysx9" advanced="true" layout="hz" colGap="40" excludeInvisibles="true"/>
+    <component id="n41_gfx4" name="btnLeagueSkill" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,428" size="330,46" group="n44_gfx4">
+      <Button title="学习茶艺技能" titleFontSize="30"/>
+    </component>
+    <text id="n42_gfx4" name="txtskillType" xy="332,429" size="92,42" group="n44_gfx4" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#666666]第N层[/color]"/>
+    <group id="n44_gfx4" name="n44" xy="0,428" size="424,46" group="n28_ysx9" advanced="true" layout="hz" colGap="2">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <component id="n62_ebfi" name="btnMaxFightSpeed" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,489" size="330,46" group="n28_ysx9">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="8倍战斗速度" titleFontSize="30"/>
+    </component>
+    <component id="n60_y5mt" name="btnAddLeagueNum" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,550" size="166,46" group="n53_y5mt">
       <Button title="添加联盟值" titleFontSize="30"/>
     </component>
-    <text id="n50_y5mt" name="AddLeagueNumType" xy="184,492" size="139,42" group="n53_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
-    <text id="n51_y5mt" name="AddNum" xy="354,492" size="141,42" group="n53_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
-    <group id="n53_y5mt" name="n53" xy="1,492" size="494,46"/>
-    <component id="n61_y5mt" name="btnSetLeaguNum" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,545" size="166,46" group="n58_y5mt">
+    <text id="n50_y5mt" name="AddLeagueNumType" xy="184,550" size="139,42" group="n53_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n51_y5mt" name="AddNum" xy="354,550" size="141,42" group="n53_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <group id="n53_y5mt" name="n53" xy="1,550" size="494,46" group="n28_ysx9" advanced="true"/>
+    <component id="n61_y5mt" name="btnSetLeaguNum" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,611" size="166,46" group="n58_y5mt">
       <Button title="设置联盟值" titleFontSize="30"/>
     </component>
-    <text id="n55_y5mt" name="SetLeagueNumType" xy="186,545" size="139,42" group="n58_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
-    <text id="n56_y5mt" name="SetNum" xy="354,545" size="141,42" group="n58_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
-    <group id="n58_y5mt" name="n58" xy="1,545" size="494,46"/>
+    <text id="n55_y5mt" name="SetLeagueNumType" xy="186,611" size="139,42" group="n58_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n56_y5mt" name="SetNum" xy="354,611" size="141,42" group="n58_y5mt" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <group id="n58_y5mt" name="n58" xy="1,611" size="494,46" group="n28_ysx9" advanced="true"/>
+    <group id="n28_ysx9" name="n28" xy="0,0" size="499,657" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs

@@ -19,11 +19,12 @@ namespace UI.RoleInfo
         public GButton m_btnArenaGrade;
         public GTextInput m_txtArenaGrade;
         public GTextInput m_txtArenaRank;
-        public GButton m_btnLeagueSkill;
-        public GTextInput m_txtskillType;
         public GButton m_btnAnswerStart;
         public GButton m_btnAnswerEnd;
         public GButton m_btnAnswerActiveEnd;
+        public GButton m_btnLeagueSkill;
+        public GTextInput m_txtskillType;
+        public GButton m_btnMaxFightSpeed;
         public GButton m_btnAddLeagueNum;
         public GTextInput m_AddLeagueNumType;
         public GTextInput m_AddNum;
@@ -89,11 +90,12 @@ namespace UI.RoleInfo
             m_btnArenaGrade = (GButton)comp.GetChild("btnArenaGrade");
             m_txtArenaGrade = (GTextInput)comp.GetChild("txtArenaGrade");
             m_txtArenaRank = (GTextInput)comp.GetChild("txtArenaRank");
-            m_btnLeagueSkill = (GButton)comp.GetChild("btnLeagueSkill");
-            m_txtskillType = (GTextInput)comp.GetChild("txtskillType");
             m_btnAnswerStart = (GButton)comp.GetChild("btnAnswerStart");
             m_btnAnswerEnd = (GButton)comp.GetChild("btnAnswerEnd");
             m_btnAnswerActiveEnd = (GButton)comp.GetChild("btnAnswerActiveEnd");
+            m_btnLeagueSkill = (GButton)comp.GetChild("btnLeagueSkill");
+            m_txtskillType = (GTextInput)comp.GetChild("txtskillType");
+            m_btnMaxFightSpeed = (GButton)comp.GetChild("btnMaxFightSpeed");
             m_btnAddLeagueNum = (GButton)comp.GetChild("btnAddLeagueNum");
             m_AddLeagueNumType = (GTextInput)comp.GetChild("AddLeagueNumType");
             m_AddNum = (GTextInput)comp.GetChild("AddNum");
@@ -115,11 +117,12 @@ namespace UI.RoleInfo
             m_btnArenaGrade = null;
             m_txtArenaGrade = null;
             m_txtArenaRank = null;
-            m_btnLeagueSkill = null;
-            m_txtskillType = null;
             m_btnAnswerStart = null;
             m_btnAnswerEnd = null;
             m_btnAnswerActiveEnd = null;
+            m_btnLeagueSkill = null;
+            m_txtskillType = null;
+            m_btnMaxFightSpeed = null;
             m_btnAddLeagueNum = null;
             m_AddLeagueNumType = null;
             m_AddNum = null;

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

@@ -38,9 +38,9 @@ namespace GFGGame
             _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_ComBtn.m_btnAddLeagueNum.onClick.Add(OnClickBtnLeagueAddNum);
             _ui.m_ComBtn.m_btnSetLeaguNum.onClick.Add(OnClickBtnLeagueSetNum);
+            _ui.m_ComBtn.m_btnMaxFightSpeed.onClick.Add(OnClickBtnMaxFightSpeed);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
             _ui.m_btnAddNum.onClick.Add(OnClickBtnAddCount);
@@ -235,6 +235,10 @@ namespace GFGGame
             OnClickBtnSkipCheckOpen();
         }
 
+        private void OnClickBtnMaxFightSpeed()
+        {
+            FightDataManager.Instance.maxFightSpeed = 8;
+        }
         private void OnClickBtnGM(EventContext context)
         {
             string content = _ui.m_inputGM.text;