登峰造极特效

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,11 +1,11 @@
 <?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" font="ui://mfvz4q8kqkjsnw" fontSize="40" text="66666"/>
-    <graph id="n42_gfx4" name="holderLoop" xy="172,183" size="1,1"/>
-    <graph id="n43_gfx4" name="holder" xy="172,183" size="1,1"/>
-    <graph id="n44_gfx4" name="holderSmokeIn" xy="172,183" size="1,1"/>
-    <graph id="n45_gfx4" name="holderSmokeOut" xy="172,183" size="1,1"/>
+    <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"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n38_qgxy" value="false"/>
@@ -16,7 +16,21 @@
   </transition>
   <transition name="t1">
     <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"/>
+  </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"/>
   </transition>
-  <transition name="t2"/>
 </component>

FGUIProject/assets/RoleInfo/components/ComBtn.xml

@@ -47,5 +47,15 @@
       <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">
+      <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">
+      <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">
+      <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"/>
   </displayList>
 </component>

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

@@ -7,12 +7,14 @@ namespace UI.Main
     public partial class UI_ComAllPerfect
     {
         public GComponent target;
-        public GImage m_imgCircle;
-        public GGraph m_holder;
-        public GImage m_img;
         public GTextField m_txtCount;
+        public GGraph m_holderLoop;
+        public GGraph m_holder;
+        public GGraph m_holderSmokeIn;
+        public GGraph m_holderSmokeOut;
         public Transition m_t0;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8kpsphj4";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComAllPerfect";
@@ -60,21 +62,25 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_imgCircle = (GImage)comp.GetChild("imgCircle");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_img = (GImage)comp.GetChild("img");
             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_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_imgCircle = null;
-            m_holder = null;
-            m_img = null;
             m_txtCount = null;
+            m_holderLoop = null;
+            m_holder = null;
+            m_holderSmokeIn = null;
+            m_holderSmokeOut = null;
             m_t0 = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -21,6 +21,9 @@ namespace UI.RoleInfo
         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 const string URL = "ui://374k3dwvlqp0dm";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
@@ -82,6 +85,9 @@ namespace UI.RoleInfo
             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");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,6 +105,9 @@ namespace UI.RoleInfo
             m_txtArenaRank = null;
             m_btnLeagueSkill = null;
             m_txtskillType = null;
+            m_btnAnswerStart = null;
+            m_btnAnswerEnd = null;
+            m_btnAnswerActiveEnd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -24,6 +24,7 @@ namespace GFGGame
         private NTexture _nTexture;
         private float _time = 0;// 登峰造极按住的时间
         private int _prefectCount = 0;//卓越点击数量
+        private bool _isAllPerfect = false;//登峰造极中
 
         private GameObject _gameObject0;
         private GameObject _gameObject1;
@@ -98,6 +99,8 @@ namespace GFGGame
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
 
             _ui.m_comClick.target.onClick.Add(CheckPerfectSkill);
+            _ui.m_comClick.target.onTouchBegin.Add(OnComAllCircleClickBegin);
+            _ui.m_comClick.target.onTouchEnd.Add(OnComAllCircleClickBegin);
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             // _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
@@ -174,7 +177,7 @@ namespace GFGGame
             _ui.m_proScore.m_txtCount.text = "总分 0";
             _ui.m_comClick.target.touchable = false;
             _ui.m_comAllPerfect.target.visible = false;
-            // _ui.m_LoaMask.visible = false;
+            _isAllPerfect = false;
 
             _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
             // _stopFight = false;
@@ -268,14 +271,21 @@ 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 (clickType == ClickType.PREFACT_CLICK)
+            if (!_isAllPerfect)
             {
-                _currentTime = BeginTime.PART_PREFACT_CLICK;
-                SkillScoreStart(null);
+                if (clickType == ClickType.PREFACT_CLICK)
+                {
+                    _currentTime = BeginTime.PART_PREFACT_CLICK;
+                    SkillScoreStart(null);
+                }
+                else
+                {
+                    PartScoreResultStart(clickType);
+                }
             }
             else
             {
-                PartScoreResultStart(clickType);
+                OnComAllCircleClickBegin();
             }
         }
         private void PartScoreResultStart(int clickType)
@@ -347,7 +357,7 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_prefectCount > 0)// FightScoreCfgArray.Instance.dataArray.Length)
+                if (_prefectCount > FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
                 {
                     _ui.m_comAllPerfect.target.visible = true;
                     AllCirclePlayStart();//完美八连击
@@ -376,24 +386,22 @@ namespace GFGGame
         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(() =>
-            {
-                AllCircleScoreEnd();
-            });
+            _ui.m_comAllPerfect.m_t0.Play();
         }
         private void OnComAllCircleClickBegin()
         {
-            if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
-            {
-                Timers.inst.Remove(ComAllCirclePressTime);
-            }
-            else
-            {
-                Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
-            }
+            // if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
+            // {
+            //     Timers.inst.Remove(ComAllCirclePressTime);
+            // }
+            // else
+            // {
+            Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
+            // }
         }
         private void ComAllCirclePressTime(object param = null)
         {

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

@@ -560,14 +560,14 @@ namespace GFGGame
         }
         private void OnComAllCircleClickBegin()
         {
-            if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
-            {
-                Timers.inst.Remove(ComAllCirclePressTime);
-            }
-            else
-            {
-                Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
-            }
+            // if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
+            // {
+            //     Timers.inst.Remove(ComAllCirclePressTime);
+            // }
+            // else
+            // {
+            Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
+            // }
         }
         private void ComAllCirclePressTime(object param = null)
         {

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         {
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            // CDN_ROOT = "http://10.108.64.143/";
+            CDN_ROOT = "http://10.108.64.143/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";

GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: f21b5e84ae865fe4c8ee426a73ffe8c4
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 71a5a6d3d384aa54da774c96d5468df0
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: