Quellcode durchsuchen

雅集答题换新ui

huangxiaoyue vor 1 Jahr
Ursprung
Commit
74171ca982
24 geänderte Dateien mit 10 neuen und 202 gelöschten Zeilen
  1. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs
  2. 4 4
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs
  3. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  4. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  5. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  6. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  7. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  8. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  9. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  10. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  12. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  14. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  16. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png
  18. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png
  20. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png
  21. 0 96
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta
  22. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png
  23. 0 96
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta
  24. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs

@@ -20,6 +20,8 @@ namespace UI.League
         public GTextField m_txtAnswerTime;
         public GTextField m_txtAnswerNum;
         public GTextField m_txtContent;
+        public GTextInput m_txtResult;
+        public GImage m_imgFault;
         public GList m_listResult;
         public GLoader m_loaIocn;
         public UI_ComHeadIcon m_comRightHead;
@@ -33,8 +35,6 @@ namespace UI.League
         public GList m_listChat;
         public GTextInput m_txtChat;
         public UI_Button22 m_btnSend;
-        public GTextInput m_txtResult;
-        public GImage m_imgFault;
         public const string URL = "ui://tw70qm9dpvb453";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueAnsweringUI";
@@ -95,6 +95,8 @@ namespace UI.League
             m_txtAnswerTime = (GTextField)comp.GetChild("txtAnswerTime");
             m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtResult = (GTextInput)comp.GetChild("txtResult");
+            m_imgFault = (GImage)comp.GetChild("imgFault");
             m_listResult = (GList)comp.GetChild("listResult");
             m_loaIocn = (GLoader)comp.GetChild("loaIocn");
             m_comRightHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comRightHead"));
@@ -108,8 +110,6 @@ namespace UI.League
             m_listChat = (GList)comp.GetChild("listChat");
             m_txtChat = (GTextInput)comp.GetChild("txtChat");
             m_btnSend = (UI_Button22)UI_Button22.Create(comp.GetChild("btnSend"));
-            m_txtResult = (GTextInput)comp.GetChild("txtResult");
-            m_imgFault = (GImage)comp.GetChild("imgFault");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -126,6 +126,8 @@ namespace UI.League
             m_txtAnswerTime = null;
             m_txtAnswerNum = null;
             m_txtContent = null;
+            m_txtResult = null;
+            m_imgFault = null;
             m_listResult = null;
             m_loaIocn = null;
             m_comRightHead.Dispose();
@@ -141,8 +143,6 @@ namespace UI.League
             m_txtChat = null;
             m_btnSend.Dispose();
             m_btnSend = null;
-            m_txtResult = null;
-            m_imgFault = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -182,7 +182,7 @@ namespace GFGGame
                 Hide();
                 return;
             }
-            _ui.m_txtTime.text = string.Format("{0}{1}", str, TimeUtil.FormattingTimeTo_mmss(endTime - curTime));
+            _ui.m_txtTime.text = string.Format("{0}[color=#E07748]{1}[/color]", str, TimeUtil.FormattingTimeTo_mmss(endTime - curTime));
         }
         private void UpdateQuestionState()
         {
@@ -241,7 +241,7 @@ namespace GFGGame
         private void UpdateResult()
         {
             _ui.m_ctrlResult.selectedIndex = LeagueDataManager.Instance.LastAnswerRoleData.LastQuestionResult;
-            _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            _ui.m_txtRightCount.text = string.Format("全员已答对[color=#AF5638]{0}[/color]题", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
             _ui.m_txtRightCount.SetVar("value", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtRightCount1.SetVar("value", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtCdTime.SetVar("value", GlobalCfgArray.globalCfg.leagueQuestionNextTime.ToString()).FlushVars();
@@ -255,7 +255,7 @@ namespace GFGGame
                 OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(LeagueDataManager.Instance.LastAnswerRoleData.RightRoleId);
                 ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleInfoData.headId == 0 ? ConstItemID.HEADID : roleInfoData.headId);
                 _ui.m_comRightHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-                _ui.m_txtInfo.text = string.Format("{0} 答对了!", roleInfoData.roleName);
+                _ui.m_txtInfo.text = string.Format("{0} [color=#915E15]答对了![/color]", roleInfoData.roleName);
                 _ui.m_holderHead.visible = true;
                 Timers.inst.Remove(UpdateResultTime);
                 Timers.inst.Add(1, 0, UpdateResultTime);
@@ -274,7 +274,7 @@ namespace GFGGame
                 _ui.m_imgFail.visible = false;
                 if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionCount) == GlobalCfgArray.globalCfg.leagueQuestionNum)//全部答完
                 {
-                    _ui.m_txtInfo.text = "全部题目答完啦~";
+                    _ui.m_txtInfo.text = "全部题目答完啦,活动结束啦~";
                 }
                 else//答题时间结束
                 {

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 955bc580ab20c114c872810f5ca95c46
-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: 

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png


+ 0 - 96
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: a62f0da8ccae26949aad09c45313a41a
-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: 

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes