限时累充修改以及登峰造极分数修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs

@@ -10,10 +10,6 @@ namespace UI.DailyWelfare
         public GGraph m_holder;
         public GButton m_btnShow;
         public GTextField m_txtName0;
-        public GTextField m_txtName1;
-        public GTextField m_txtName2;
-        public GTextField m_txtName3;
-        public GTextField m_txtName4;
         public GList m_listGiftBag;
         public GButton m_btnGetGiftBag;
         public GTextField m_txtGiftBag;
@@ -69,10 +65,6 @@ namespace UI.DailyWelfare
             m_holder = (GGraph)comp.GetChild("holder");
             m_btnShow = (GButton)comp.GetChild("btnShow");
             m_txtName0 = (GTextField)comp.GetChild("txtName0");
-            m_txtName1 = (GTextField)comp.GetChild("txtName1");
-            m_txtName2 = (GTextField)comp.GetChild("txtName2");
-            m_txtName3 = (GTextField)comp.GetChild("txtName3");
-            m_txtName4 = (GTextField)comp.GetChild("txtName4");
             m_listGiftBag = (GList)comp.GetChild("listGiftBag");
             m_btnGetGiftBag = (GButton)comp.GetChild("btnGetGiftBag");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
@@ -84,10 +76,6 @@ namespace UI.DailyWelfare
             m_holder = null;
             m_btnShow = null;
             m_txtName0 = null;
-            m_txtName1 = null;
-            m_txtName2 = null;
-            m_txtName3 = null;
-            m_txtName4 = null;
             m_listGiftBag = null;
             m_btnGetGiftBag = null;
             m_txtGiftBag = null;

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

@@ -13,6 +13,12 @@ namespace UI.Main
         public GGraph m_holder;
         public GGraph m_holderSmokeOut;
         public GTextField m_txtCount;
+        public GLoader m_num0;
+        public GLoader m_num1;
+        public GLoader m_num2;
+        public GLoader m_num3;
+        public GLoader m_num4;
+        public GGroup m_numGrade;
         public GImage m_img3Second;
         public Transition m_t0;
         public Transition m_t1;
@@ -70,6 +76,12 @@ namespace UI.Main
             m_holder = (GGraph)comp.GetChild("holder");
             m_holderSmokeOut = (GGraph)comp.GetChild("holderSmokeOut");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_num0 = (GLoader)comp.GetChild("num0");
+            m_num1 = (GLoader)comp.GetChild("num1");
+            m_num2 = (GLoader)comp.GetChild("num2");
+            m_num3 = (GLoader)comp.GetChild("num3");
+            m_num4 = (GLoader)comp.GetChild("num4");
+            m_numGrade = (GGroup)comp.GetChild("numGrade");
             m_img3Second = (GImage)comp.GetChild("img3Second");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -83,6 +95,12 @@ namespace UI.Main
             m_holder = null;
             m_holderSmokeOut = null;
             m_txtCount = null;
+            m_num0 = null;
+            m_num1 = null;
+            m_num2 = null;
+            m_num3 = null;
+            m_num4 = null;
+            m_numGrade = null;
             m_img3Second = null;
             m_t0 = null;
             m_t1 = null;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -130,11 +130,7 @@ namespace GFGGame
 
             UI_ListShowItem item = UI_ListShowItem.Proxy(obj);
             string name = SuitCfgArray.Instance.GetCfg(vipCfg.suitId).name;
-            item.m_txtName0.text = name.Length > 0 ? name.Substring(0, 1) : "";
-            item.m_txtName1.text = name.Length > 1 ? name.Substring(1, 1) : "";
-            item.m_txtName2.text = name.Length > 2 ? name.Substring(2, 1) : "";
-            item.m_txtName3.text = name.Length > 3 ? name.Substring(3, 1) : "";
-            item.m_txtName4.text = name.Length > 4 ? name.Substring(4) : "";
+            item.m_txtName0.text = name;
             if (vipCfg.res != "")
             {
                 item.m_cardIcon.visible = true;

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
             _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
             //_ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
-
+            GameGlobal.isLogon = true;
         }
         protected override void AddEventListener()
         {

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

@@ -81,8 +81,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            GameController.GoBackToMainView();
-            //this.Hide();
+           // GameController.GoBackToMainView();
+            this.Hide();
             //ViewManager.Show<MainUIView>();
             //ViewManager.Show<StoryChapterListView>();
         }
@@ -118,7 +118,7 @@ namespace GFGGame
             {
                 if (MainStoryDataManager.CheckChapterUnlock(chapterID))
                 {
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterID, _ui.m_listType.selectedIndex }, new object[] { typeof(StoryChapterListView).FullName, new object[] { _ui.m_listType.selectedIndex } });
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterID, _ui.m_listType.selectedIndex });
                     this.Hide();
                 }
                 else

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

@@ -57,7 +57,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_switchChapter.onClick.Add(OnClickBtnBack);
+            _ui.m_switchChapter.onClick.Add(OnClickSwitchBack);
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.onClick.Add(OnClickNext);
             _ui.m_bonusBox1.target.onClick.Add(() =>
             {
@@ -135,7 +135,13 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+            //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+            GameController.GoBackToMainView();
+        }
+        
+        private void OnClickSwitchBack()
+        {
+            ViewManager.Show<StoryChapterListView>( null, new object[] { typeof(StoryChapterView).FullName, this.viewData });
         }
 
         private void OnClickBtnHome()
@@ -147,7 +153,7 @@ namespace GFGGame
         {
             if (MainStoryDataManager.CheckChapterUnlock(_chapterID+1))
             {
-                ViewManager.Show<StoryChapterView>(new object[] { _chapterID+1, currentDifficulty }, new object[] { typeof(StoryChapterListView).FullName, new object[] { currentDifficulty } });
+                ViewManager.Show<StoryChapterView>(new object[] { _chapterID+1, currentDifficulty });
             }
             else
             {

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

@@ -633,7 +633,8 @@ namespace GFGGame
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(roleData);
             }
-            _ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+            //_ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+            CheckNumImage(allCircleScore.ToString());
             _ui.m_comClick.m_comResult.target.visible = false;
 
             _time = 0;
@@ -645,6 +646,76 @@ namespace GFGGame
                     CheckAllPerfectClickSkill();
                 });
         }
+
+        private void CheckNumImage(string Num)
+        {
+            string res = "ui://Main/zd_pf_sz";
+            List<GLoader> num = new List<GLoader>
+            {
+                _ui.m_comClick.m_comAllPerfect.m_num0,
+                _ui.m_comClick.m_comAllPerfect.m_num1,
+                _ui.m_comClick.m_comAllPerfect.m_num2,
+                _ui.m_comClick.m_comAllPerfect.m_num3,
+                _ui.m_comClick.m_comAllPerfect.m_num4,
+            };
+            ET.Log.Debug("y:  " +_ui.m_comClick.m_comAllPerfect.m_numGrade.y);
+            string numflog = "";
+            for (int i = 0 ; i < 5; i++)
+            { 
+                ET.Log.Debug("numflog" + numflog +"     i"+ i);
+                numflog = Num.Length > i ? Num.Substring(i, 1) : "";
+                ET.Log.Debug("numflog" + numflog);
+                switch (Num.Length)
+                {
+                    case 0:
+                        num[i].url = null;
+                        break;
+                    case 1:
+                        if(i == 2)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 2:
+                        if (i >= 1 && i<=2)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 3:
+                        if (i >= 1 && i <= 3)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 4:
+                        if (i >= 0 && i <= 3)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 5:
+                        num[i].url = res + numflog;
+                        break;
+                }
+            }
+        }
         private void OnBtnSpeedUp()
         {
             FightDataManager.Instance.fightSpeed = FightDataManager.Instance.fightSpeed == 1 ? FightDataManager.Instance.maxFightSpeed : 1;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -214,8 +214,11 @@ namespace GFGGame
             //long lastTime = GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
 
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            ET.Log.Debug("zyq"+ GameGlobal.isLogon);
             if (GameGlobal.isLogon)
             {
+                ET.Log.Debug("zyq" + GameGlobal.isLogon);
+                ET.Log.Debug("zyq" + ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count + ":::" + GuideDataManager.currentGuideId);
                 if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
                     GuideDataManager.currentGuideId <= 0)
                 {
@@ -419,22 +422,24 @@ namespace GFGGame
             // {
             // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
-            ViewManager.Show<StoryChapterListView>(null,
-                new object[] { typeof(MainUIView).FullName, this.viewData });
-            isOpen = false;
-            ;
+            //ViewManager.Show<StoryChapterListView>(null,
+            //    new object[] { typeof(MainUIView).FullName, this.viewData });
+            //isOpen = false;
+            //;
             List<StoryChapterCfg> _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(0);
             for (int i = 0; i < _chapterCfgs.Count; i++)
             {
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 if (i == _chapterCfgs.Count - 1)
                 {
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 }, new object[] { typeof(StoryChapterListView).FullName, new object[] { 0 } });
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
+                    isOpen = false;
                     return;
                 }
                 else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 }, new object[] { typeof(StoryChapterListView).FullName, new object[] { 0 } });
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
+                    isOpen = false;
                     return;
                 }
             }

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 186d8720358d4f24bb2ef965fe3742a6
+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/DailyWelfare/DailyWelfare_atlas0_6.png.meta

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