服装描述增加超链接

Assets/Resource/Logo.unity

@@ -630,3 +630,151 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1894286777
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: -15
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: -54.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -54127,7 +54127,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -134,6 +134,7 @@
     <P_SaveSucceed desc=""><![CDATA[保存成功]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
+    <Pa_VisitWarning desc=""><![CDATA[提示]]></Pa_VisitWarning>
     <Pg_Cute desc=""><![CDATA[可爱]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[优雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活泼]]></Pg_Vivid>
@@ -921,7 +922,7 @@
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶梦]]></Armature1005>
-    <DesignByKnife desc=""><![CDATA[热心玩家<{<color=blue>小刀</color>}>设计]]></DesignByKnife>
+    <DesignByKnife desc=""><![CDATA[热心玩家<{<color=blue>小刀</color>}>设计ID[1803184231107169843]]]></DesignByKnife>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下，即使离线，花园也有收益哟~]]></Tip1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -134,6 +134,7 @@
     <P_SaveSucceed desc=""><![CDATA[保存成功]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
+    <Pa_VisitWarning desc=""><![CDATA[]]></Pa_VisitWarning>
     <Pg_Cute desc=""><![CDATA[可愛]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[優雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活潑]]></Pg_Vivid>
@@ -921,7 +922,7 @@
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶夢]]></Armature1005>
-    <DesignByKnife desc=""><![CDATA[熱心玩家<{<color=blue>小刀</color>}>設計]]></DesignByKnife>
+    <DesignByKnife desc=""><![CDATA[熱心玩家<{<color=blue>小刀</color>}>設計ID[1803184231107169843]]]></DesignByKnife>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下，即使離線，花園也有收益喲~]]></Tip1>

Assets/Resource/XML/lan/English.xml

@@ -134,6 +134,7 @@ Program 水怪
     <P_SaveSucceed desc=""><![CDATA[Saved]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
+    <Pa_VisitWarning desc=""><![CDATA[]]></Pa_VisitWarning>
     <Pg_Cute desc=""><![CDATA[Cute]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[Graceful]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[Lively]]></Pg_Vivid>
@@ -920,7 +921,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
     <Armature1004 desc=""><![CDATA[Butterfly Elf]]></Armature1004>
     <Armature1005 desc=""><![CDATA[Dream of Butterfly]]></Armature1005>
-    <DesignByKnife desc=""><![CDATA[Design by player <{<color=blue>小刀</color>}>]]></DesignByKnife>
+    <DesignByKnife desc=""><![CDATA[Design by player <{<color=blue>小刀</color>}>ID[1803184231107169843]]]></DesignByKnife>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[The visitors will come to pay the tickest for your garden even if your are offline!]]></Tip1>

Assets/Script/Editor/EditorBundle.cs

@@ -174,7 +174,7 @@ public class EditorBundle : Editor
             //"new_dress_config",
             //"new_language_config",
             //"new_flower_config",
-            //"new_flower_tex",
+            "new_flower_tex",
         };
         foreach (var name in names)
         {

Assets/Script/Label/LanguageLabel.cs

@@ -146,6 +146,7 @@ public class LanguageLabel
     	public static string UI__P_SaveSucceed = "UI__P_SaveSucceed";
     	public static string UI__Pa_Tit = "UI__Pa_Tit";
     	public static string UI__Pa_BtnLab = "UI__Pa_BtnLab";
+    	public static string UI__Pa_VisitWarning = "UI__Pa_VisitWarning";
     	public static string UI__Pg_Cute = "UI__Pg_Cute";
     	public static string UI__Pg_Grace = "UI__Pg_Grace";
     	public static string UI__Pg_Vivid = "UI__Pg_Vivid";
@@ -912,9 +913,7 @@ public class LanguageLabel
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";
     	public static string DressRoom__Armature1004 = "DressRoom__Armature1004";
     	public static string DressRoom__Armature1005 = "DressRoom__Armature1005";
-    	public static string DressRoom__Desc0 = "DressRoom__Desc0";
-    	public static string DressRoom__Desc1 = "DressRoom__Desc1";
-    	public static string DressRoom__Desc2 = "DressRoom__Desc2";
+    	public static string DressRoom__DesignByKnife = "DressRoom__DesignByKnife";
     	public static string Tip = "Tip";
     	public static string Tip__Tip1 = "Tip__Tip1";
     	public static string Tip__Tip2 = "Tip__Tip2";

Assets/Script/Manage/ConfigManager.cs

@@ -1438,6 +1438,13 @@ public class ConfigManager : Regist
             ToVersion23(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 24)
+        {
+            Debug.LogWarning("UpdateArchive to 24");
+
+            ToVersion24(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1798,4 +1805,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion24(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 24.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/UIManager.cs

@@ -2070,7 +2070,8 @@ public class UIManager : Regist
 
         #region I
 
-        ResourceManager.Get(CanvasLabel.I_BlackMask).CreateTweenCG(1, 0, 1f, true, false, Curve.EaseOutQuad);
+        TweenCG tweenCG = ResourceManager.Get(CanvasLabel.I_BlackMask).CreateTweenCG(1, 0, 1f, true, false, Curve.EaseOutQuad);
+        tweenCG.CG = false;
 
         #endregion
 

Assets/Script/Object/Player.cs

@@ -9,6 +9,7 @@ using System.Xml;
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using textUtility;
 using Animation = DragonBones.Animation;
 using Slot = DragonBones.Slot;
@@ -485,7 +486,15 @@ public class CloseItem
         else
         {
             descTxt.SetActive(true);
+
             string descContent = Language.GetStr("DressRoom", desc);
+            Match match = Regex.Match(descContent, "ID\\[\\d+\\]");
+            targetSerialNumber = match.Value;
+            descContent = descContent.Replace(targetSerialNumber, "");
+            targetSerialNumber = Regex.Match(match.Value, "\\d+").Value;
+            descTxt.SuperlinkCallbackDictionary = new Dictionary<int, Action<int>>();
+            descTxt.SuperlinkCallbackDictionary.Add(0, OnSuperlinkClick);
+
             descTxt.text = descContent;
             descTxt.SetContent(descContent);
         }
@@ -500,6 +509,35 @@ public class CloseItem
         );
     }
 
+    private string targetSerialNumber;
+    private void OnSuperlinkClick(int id)
+    {
+        if (Manager.Coin < VisitManager.VisitCost)
+        {
+            Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortCoin), null, null, Lib.GoldSprite);
+        }
+        else
+        {
+            Bubble.Show
+            (
+                null,
+                Language.GetStr(LanguageLabel.UI__Pa_VisitWarning),
+                null,
+                null,
+                () =>
+                {
+                    ResourceManager.Get<Button>(CanvasLabel.Pa_Close).onClick.Invoke();
+                    PlayerManager.Player.ResetDressDatas();
+                    TweenRoot tweenRoot = PlayerManager.Player.ExitDressRoom();
+                    tweenRoot.AddEventOnetime(EventType.ForwardFinish, () =>
+                    {
+                        VisitManager.Visit(ConfigSource.SerialNumber, targetSerialNumber);
+                    });
+                }
+            );
+        }
+    }
+
 
     public void Unlock()
     {
@@ -1282,30 +1320,30 @@ public class Player : Regist , IPointerClickHandler
         }
     }
 
-    public void ExitDressRoom()
+    public TweenRoot ExitDressRoom()
     {
         Manager.SceneSwitchFlag = false;
 
         TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
-            (
-                EventType.BackwardFinish,
-                () =>
-                {
-                    transform.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
+        (
+            EventType.BackwardFinish,
+            () =>
+            {
+                transform.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
 
-                    transform.position = PosInGarden;
-                    //transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
-                    transform.localScale = ResourceManager.Get(GardenLabel.GardenPlayerPos).lossyScale;
+                transform.position = PosInGarden;
+                //transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
+                transform.localScale = ResourceManager.Get(GardenLabel.GardenPlayerPos).lossyScale;
 
-                    ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
-                    ResourceManager.Get(DressroomLabel.DressRoom).TweenBacSr();
+                ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
+                ResourceManager.Get(DressroomLabel.DressRoom).TweenBacSr();
 
-                    ResourceManager.Get(CanvasLabel.C_Main).TweenForCG();
-                    ResourceManager.Get(CanvasLabel.P_DressRoom).TweenBacCG();
-                }
-            );
+                ResourceManager.Get(CanvasLabel.C_Main).TweenForCG();
+                ResourceManager.Get(CanvasLabel.P_DressRoom).TweenBacCG();
+            }
+        );
 
 
         tweenRoot = ResourceManager.Get(CanvasLabel.P_DressRoom).GetTweenCG();
@@ -1329,6 +1367,8 @@ public class Player : Regist , IPointerClickHandler
                     ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
                 }
             );
+
+        return ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
     }
 
     public void EnterDressRoom()

Assets/Script/Tool/Bundle.cs

@@ -42,7 +42,7 @@ public class Bundle : MonoBehaviour
         ResourceLabel.NewDressTex,
         //ResourceLabel.NewLanguage,
         //ResourceLabel.NewFlowerConfig,
-        //ResourceLabel.NewFlowerTex,
+        ResourceLabel.NewFlowerTex,
     };
 
     //public List<Object> NewDressConfigList;
@@ -939,12 +939,12 @@ public class Bundle : MonoBehaviour
             Initializer.DebugText.text = "08";
             //NewFlowerConfigs = ConfigManager.GetFlowerConfig(NewFlowerConfig.LoadAsset<TextAsset>(ResourceLabel.NewFlowerConfig));
 
-            //Initializer.DebugText.text = "09";
-            //sprites = NewFlowerTex.LoadAllAssets<Sprite>();
-            //for (int i = 0; i < sprites.Length; i++)
-            //{
-            //    ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
-            //}
+            Initializer.DebugText.text = "09";
+            sprites = NewFlowerTex.LoadAllAssets<Sprite>();
+            for (int i = 0; i < sprites.Length; i++)
+            {
+                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
+            }
 
             UpdateComplete = true;
 

Assets/Tookits/TextUtility/RichText.cs

@@ -8,7 +8,6 @@ namespace textUtility
 		using System.Collections.Generic;
 		using System.Text;
 		using System.Text.RegularExpressions;
-		using UnityEditor.VisualStudioIntegration;
 		using UnityEngine;
 		using UnityEngine.UI;
 	

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []