Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

FGUIProject/assets/Card/ComImgCard.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" overflow="scroll" scroll="horizontal" scrollBarFlags="128">
+<component size="1080,1920" overflow="scroll" scroll="horizontal" scrollBarFlags="128" scrollBar="visible">
   <displayList>
-    <component id="n78_qgxy" name="ComCardImgRes" src="qgxy9s" fileName="ComCardImgRes.xml" xy="0,0" pivot="0.5,0"/>
+    <component id="n78_qgxy" name="ComCardImgRes" src="qgxy9s" fileName="ComCardImgRes.xml" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/Button5.xml

@@ -2,12 +2,16 @@
 <component size="264,79" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_d4iw" name="n0" src="d4iwj" fileName="imagesExport/sc_anniu_1.png" xy="0,3">
+    <image id="n0_d4iw" name="n0" src="d4iwj" fileName="imagesExport/sc_anniu_1.png" xy="0,3" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_d4iw" name="title" xy="0,0" size="264,79" fontSize="36" color="#be7e42" align="center" vAlign="middle" autoSize="none" singleLine="true" text="60">
+    <text id="n1_d4iw" name="title" xy="126,9" size="64,64" group="n3_dmsi" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
+    <text id="n2_dmsi" name="n2" xy="74,9" size="52,64" group="n3_dmsi" fontSize="48" color="#8b6540" text="￥"/>
+    <group id="n3_dmsi" name="n3" xy="74,9" size="116,64" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/RechargeStore/components/Button2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="258,70" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_dmsi" src="dmsi17" name="n0" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <image id="n1_dmsi" src="dmsi16" name="n1" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/RechargeStore/components/StoreListItem.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="678,286">
+<component size="302,517" pivot="0.5,0">
   <displayList>
-    <image id="n11_d4iw" name="n11" src="d4iwk" fileName="images/sc_diban_1.png" xy="0,0"/>
-    <image id="n12_d4iw" name="imgDouble" src="d4iwi" fileName="images/sc_scjiabei.png" xy="347,0"/>
-    <loader id="n15_d4iw" name="icon" xy="443,62" size="162,162" url="ui://vlgobc15d4iwl"/>
-    <text id="n16_d4iw" name="txtName" xy="115,49" pivot="0.5,0" size="165,56" fontSize="42" color="#f9dcb5" align="center" text="钻石600">
+    <image id="n17_dmsi" name="n17" src="dmsi1c" fileName="images/sc_kuangdikjia_1.png" xy="0,0"/>
+    <image id="n12_d4iw" name="imgDouble" src="dmsi1e" fileName="images/sc_kuangjia_2.png" xy="242,97"/>
+    <loader id="n15_d4iw" name="icon" xy="70,211" size="162,162" url="ui://vlgobc15d4iwl"/>
+    <text id="n16_d4iw" name="txtName" xy="76,140" pivot="0.5,0" size="149,52" fontSize="38" color="#906d4b" align="center" text="钻石600">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <component id="n14_d4iw" name="btnBuy" src="d4iw59" fileName="components/Button5.xml" pkg="eg2y0ldp" xy="66,191">
-      <Button title="¥60"/>
-    </component>
+    <component id="n14_d4iw" name="btnBuy" src="d4iw59" fileName="components/Button5.xml" pkg="eg2y0ldp" xy="19,433"/>
+    <text id="n18_dmsi" name="txtDouble" xy="8,394" pivot="0.5,0" size="286,49" fontSize="36" color="#bb674e" text="首充赠送+60钻石"/>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/package.xml

@@ -31,6 +31,28 @@
     <image id="nz0t12" name="sc_zdyy_1.png" path="/images/"/>
     <image id="nz0t13" name="sc_zdyy_2.png" path="/images/"/>
     <component id="nz0t14" name="Button1.xml" path="/components/"/>
+    <image id="dmsi15" name="scsc_anniuej_2.png" path="/images/"/>
+    <image id="dmsi16" name="sc_anniuyij_1.png" path="/images/"/>
+    <image id="dmsi17" name="sc_anniuyij_2.png" path="/images/"/>
+    <image id="dmsi18" name="sc_anniuyij_3.png" path="/images/"/>
+    <image id="dmsi19" name="sc_anniuyij_4.png" path="/images/"/>
+    <image id="dmsi1a" name="sc_anniuyij_5.png" path="/images/"/>
+    <image id="dmsi1b" name="sc_anniuyij_6.png" path="/images/"/>
+    <image id="dmsi1c" name="sc_kuangdikjia_1.png" path="/images/"/>
+    <image id="dmsi1d" name="sc_kuangjia_1.png" path="/images/"/>
+    <image id="dmsi1e" name="sc_kuangjia_2.png" path="/images/"/>
+    <image id="dmsi1f" name="sc_shulianga.png" path="/images/"/>
+    <image id="dmsi1g" name="scsc_anniuej_1.png" path="/images/"/>
+    <image id="dmsi1h" name="sc_xtxtxt.png" path="/images/"/>
+    <image id="dmsi1i" name="sc_kuangand.png" path="/images/"/>
+    <image id="dmsi1j" name="sc_kuangczcz.png" path="/images/"/>
+    <image id="dmsi1k" name="sc_kuangdikjia_2.png" path="/images/"/>
+    <image id="dmsi1l" name="sc_kuangsjsj.png" path="/images/"/>
+    <image id="dmsi1m" name="sc_tc_xian_1.png" path="/images/"/>
+    <image id="dmsi1n" name="sc_tc_anniu_1.png" path="/images/"/>
+    <image id="dmsi1o" name="sc_tc_kuang_2.png" path="/images/"/>
+    <image id="dmsi1p" name="sc_tc_kuang_3.png" path="/images/"/>
+    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -18,6 +18,8 @@ namespace GFGEditor
             InstanceZonesScanner.StartScan();
             //写入卡牌最大等级
             CardScanner.StartScan();
+
+            GiftBagScanner.StartScan();
         }
     }
 }

GameClient/Assets/Editor/Excel/Scanner/GiftBagScanner.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using GFGGame;
+
+namespace GFGEditor
+{
+    public class GiftBagScanner
+    {//计算每个副本的关卡数
+        // private static Dictionary<int, int> levelCountDIc = new Dictionary<int, int>();
+        public static void StartScan()
+        {
+            var dataArray = GiftBagCfgArray.Instance.dataArray;
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    int type = 0;
+                    if (cfg.costId == 0)
+                    {
+
+                    }
+                    switch (cfg.costId)
+                    {
+                        case 0:
+                            type = 0;
+                            break;
+                        case ConstItemID.DIAMOND_RED:
+                            type = 1;
+                            break;
+                        case 2:
+                            type = 2;
+                            break;
+                        default:
+                            type = 3;
+                            break;
+                    }
+                    // count++;
+
+                    var names = new string[] { nameof(cfg.costType) };
+                    var values = new string[] { "" + type };
+                    SQLiteHelper.Instance.UpdateValues(nameof(GiftBagCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+
+            //写入
+            // WriteStoryChapter();
+            // WriteStudioChapter();
+        }
+    }
+}

GameClient/Assets/Editor/Excel/Scanner/GiftBagScanner.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0499b57893b339f4094723086336ed02
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreListItem.cs

@@ -11,6 +11,7 @@ namespace UI.RechargeStore
         public GLoader m_icon;
         public GTextField m_txtName;
         public GButton m_btnBuy;
+        public GTextField m_txtDouble;
         public const string URL = "ui://vlgobc15d4iwr";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "StoreListItem";
@@ -62,6 +63,7 @@ namespace UI.RechargeStore
             m_icon = (GLoader)comp.GetChild("icon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_txtDouble = (GTextField)comp.GetChild("txtDouble");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.RechargeStore
             m_icon = null;
             m_txtName = null;
             m_btnBuy = null;
+            m_txtDouble = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -112,6 +112,7 @@ namespace GFGGame
             base.OnShown();
             _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
 
+            comCardImgResInitSize = Vector2.zero;
             _cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
             showCard = false;
             Input.multiTouchEnabled = false;
@@ -187,9 +188,14 @@ namespace GFGGame
                 if (comCardImgResInitSize == Vector2.zero)
                 {
                     _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(_cardData.resources[_cardData.resIndex]);
-                    comCardImgResInitSize = new Vector2(_ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initWidth * 0.8f, _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initHeight * 0.8f);
+                    GLoader loaCard = _ui.m_comImgCard.m_ComCardImgRes.m_loaCard;
+                    float scale = _ui.target.height * 0.8f / loaCard.initHeight;
+                    comCardImgResInitSize = new Vector2(loaCard.initWidth * scale, loaCard.initHeight * scale);
+                    // comCardImgResInitSize = new Vector2(_ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initWidth * 0.8f, _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initHeight * 0.8f);
+                    // _ui.m_comImgCard.target.size = new Vector2(_ui.target.width, _ui.target.height * 0.8f);
                     _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
+
                 }
 
                 //SetSize(_ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initWidth * _cardScale, _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.initHeight * _cardScale);
@@ -642,31 +648,32 @@ namespace GFGGame
             if (!showCard)
             {
                 _ui.m_loaListener1.visible = false;
-                // _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, true);
                 GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize * scale, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
                 {
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
                 });
+
+                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, ((comCardImgResInitSize * scale).x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                });
                 _ui.m_t0.Play();
                 showCard = true;
             }
             else
             {
                 _ui.m_loaListener1.visible = true;
-                _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, true);
-                GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.25f).SetTarget(_ui.m_comImgCard).OnUpdate((GTweener t) =>
+                GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
                {
                    _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
                });
-
+                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                });
                 _ui.m_t1.Play();
                 showCard = false;
             }
-            // _ui.m_t0.Play(() =>
-            // {
-            //     ViewManager.Show(ViewName.CARD_SHOW_VIEW, _cardData, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
-
-            // });
         }
         private void OnClickComCard()
         {

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -24,7 +24,6 @@ namespace GFGGame
         private GameObject _gameObject;
         private GoWrapper _wrapper;
 
-        private int sortingOrder;
         public override void Dispose()
         {
             base.Dispose();
@@ -37,7 +36,6 @@ namespace GFGGame
             packageName = UI_GuideUI.PACKAGE_NAME;
             _ui = UI_GuideUI.Create();
             this.viewCom = _ui.target;
-            // this.clickBlankToClose = false;
             this.layer = ConstViewLayer.TOP;
             isfullScreen = true;
             _ui.m_rectFrameTemp.visible = false;
@@ -110,7 +108,6 @@ namespace GFGGame
 
             }
             _ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
-            // _ui.m_rectFrame.target.visible = true;
         }
 
         protected override void OnHide()
@@ -136,9 +133,7 @@ namespace GFGGame
                 _ui.m_mask.m_guideArea.size = new Vector2((int)rect.size.x, (int)rect.size.y);
                 _ui.m_mask.m_guideArea.position = new Vector2((int)rect.position.x, (int)rect.position.y);
 
-                Debug.Log("zoya000:" + _ui.m_mask.m_guideArea.position);
                 _ui.m_comHolder.target.position = _ui.m_mask.m_guideArea.position;
-                Debug.Log("zoya111:" + _ui.m_comHolder.target.position);
                 _ui.m_comHolder.target.size = _ui.m_mask.m_guideArea.size;
                 int padding = 90;
                 bool atBottom = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding + _ui.m_compTxt.target.height + padding > GRoot.inst.height;
@@ -152,8 +147,6 @@ namespace GFGGame
                     {
                         _ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding;
                     }
-                    Debug.Log("zoya222:" + _ui.m_compTxt.target.y);
-
                 }
                 int targetWidth = 20;
 
@@ -176,10 +169,6 @@ namespace GFGGame
                 }
                 else
                 {
-                    // if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) <= targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) <= targetWidth)
-                    // {
-                    //     Timers.inst.Remove(UpdateGuideRect);
-                    // }
                     _ui.m_comHolder.target.visible = true;
                     guideTarget.touchable = true;
 
@@ -188,8 +177,6 @@ namespace GFGGame
         }
         private void OnClickTarget()
         {
-            // if (guideTarget == null) return;
-            // if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (guideTarget != null) guideTarget.onClick.Remove(OnClickTarget);
             GuideController.TryCompleteGuideIndex(guideId, guideIndex);
         }