huangxiaoyue 1 жил өмнө
parent
commit
35dc3a090d

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

@@ -21,20 +21,20 @@ namespace UI.League
         public GTextField m_txtAnswerNum;
         public GTextField m_txtContent;
         public GList m_listResult;
-        public GTextInput m_txtResult;
-        public GImage m_imgFault;
-        public GTextField m_txtRightCount1;
         public GLoader m_loaIocn;
         public UI_ComHeadIcon m_comRightHead;
         public GGraph m_holderHead;
         public GImage m_imgFail;
         public GTextField m_txtInfo;
         public GTextField m_txtCdTime;
+        public GTextField m_txtRightCount1;
         public GTextField m_txtJoinNum;
         public GList m_listJoin;
         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";
@@ -96,20 +96,20 @@ namespace UI.League
             m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_listResult = (GList)comp.GetChild("listResult");
-            m_txtResult = (GTextInput)comp.GetChild("txtResult");
-            m_imgFault = (GImage)comp.GetChild("imgFault");
-            m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
             m_loaIocn = (GLoader)comp.GetChild("loaIocn");
             m_comRightHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comRightHead"));
             m_holderHead = (GGraph)comp.GetChild("holderHead");
             m_imgFail = (GImage)comp.GetChild("imgFail");
             m_txtInfo = (GTextField)comp.GetChild("txtInfo");
             m_txtCdTime = (GTextField)comp.GetChild("txtCdTime");
+            m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
             m_txtJoinNum = (GTextField)comp.GetChild("txtJoinNum");
             m_listJoin = (GList)comp.GetChild("listJoin");
             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)
         {
@@ -127,9 +127,6 @@ namespace UI.League
             m_txtAnswerNum = null;
             m_txtContent = null;
             m_listResult = null;
-            m_txtResult = null;
-            m_imgFault = null;
-            m_txtRightCount1 = null;
             m_loaIocn = null;
             m_comRightHead.Dispose();
             m_comRightHead = null;
@@ -137,12 +134,15 @@ namespace UI.League
             m_imgFail = null;
             m_txtInfo = null;
             m_txtCdTime = null;
+            m_txtRightCount1 = null;
             m_txtJoinNum = null;
             m_listJoin = null;
             m_listChat = null;
             m_txtChat = null;
             m_btnSend.Dispose();
             m_btnSend = null;
+            m_txtResult = null;
+            m_imgFault = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -988,7 +988,6 @@ namespace GFGGame
         }
         private void UpdateSearchList()
         {
-
             if (_scoreIndex == SORT_BY_HIGH_SCORE)
             {
                 _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3, true);

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

@@ -49,7 +49,7 @@ namespace GFGGame
             _ui.m_listChat.itemRenderer = RenderListChatItem;
             _ui.m_listChat.itemProvider = GetListChatItemResource;
             _ui.m_listChat.SetVirtual();
-            _ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
+            //_ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_league", "Answer_bgtx");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderHead, "ui_league", "Answer_Succeed");

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_fui.bytes


+ 8 - 0
GameClient/Assets/ResIn/UI/PopWindow.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 89429d3e5479e594d99e4f1b38b5abad
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 96 - 0
GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png.meta

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

+ 96 - 0
GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png.meta

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

+ 7 - 0
GameClient/Assets/ResIn/UI/PopWindow/PopWindow_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 751a8d5c5d5ab164e8952dfa0c40028a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: