diff --git a/Assets/Editor/Logs/NoItemLogs.txt b/Assets/Editor/Logs/NoItemLogs.txt index e69de29bb..8488b1e3f 100644 --- a/Assets/Editor/Logs/NoItemLogs.txt +++ b/Assets/Editor/Logs/NoItemLogs.txt @@ -0,0 +1,186 @@ +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x00001] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1824 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x0002f] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1830 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400007 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x00001] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1824 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400007 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x0002f] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1830 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x00001] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1824 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at ServerData.Add_Item (System.Int32 id, System.Double amount) [0x0002f] in C:\Git\nn_himminji\Assets\Script\Server\ServerClass.cs:1830 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x000c5] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:74 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at ObtainItemCard.Set[T] (T _base) [0x00015] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemCard.cs:14 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at ObtainItemUI.Set (System.Collections.Generic.List`1[T] lst) [0x00029] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemUI.cs:29 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x00122] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:77 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400007 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at ObtainItemCard.Set[T] (T _base) [0x00015] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemCard.cs:14 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at ObtainItemUI.Set (System.Collections.Generic.List`1[T] lst) [0x00029] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemUI.cs:29 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x00122] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:77 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + +2025-02-15 09:44:47 +Item ID 400004 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at ObtainItemCard.Set[T] (T _base) [0x00015] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemCard.cs:14 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at ObtainItemUI.Set (System.Collections.Generic.List`1[T] lst) [0x00029] in C:\Git\nn_himminji\Assets\Script\UI\Common\ObtainItem\ObtainItemUI.cs:29 + at CollectionEssenceUI_Right.OnClick_EssenceChange () [0x00122] in C:\Git\nn_himminji\Assets\Script\UI\Collection\Essence\CollectionEssenceUI_Right.cs:77 + at UnityEngine.Events.InvokableCall.Invoke () [0x00000] in :0 + at UnityEngine.Events.UnityEvent.Invoke () [0x00000] in :0 + at UnityEngine.UI.Button.Press () [0x00027] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:70 + at UnityEngine.UI.Button.OnPointerClick (UnityEngine.EventSystems.PointerEventData eventData) [0x00010] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\UI\Core\Button.cs:114 + at UnityEngine.EventSystems.ExecuteEvents.Execute (UnityEngine.EventSystems.IPointerClickHandler handler, UnityEngine.EventSystems.BaseEventData eventData) [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:57 + at UnityEngine.EventSystems.ExecuteEvents.Execute[T] (UnityEngine.GameObject target, UnityEngine.EventSystems.BaseEventData eventData, UnityEngine.EventSystems.ExecuteEvents+EventFunction`1[T1] functor) [0x0006f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\ExecuteEvents.cs:272 + at UnityEngine.EventSystems.StandaloneInputModule.ReleaseMouse (UnityEngine.EventSystems.PointerEventData pointerEvent, UnityEngine.GameObject currentOverGo) [0x00036] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:192 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMousePress (UnityEngine.EventSystems.PointerInputModule+MouseButtonEventData data) [0x0018f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:654 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent (System.Int32 id) [0x0002f] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:554 + at UnityEngine.EventSystems.StandaloneInputModule.ProcessMouseEvent () [0x00001] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:534 + at UnityEngine.EventSystems.StandaloneInputModule.Process () [0x0003e] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\InputModules\StandaloneInputModule.cs:282 + at UnityEngine.EventSystems.EventSystem.Update () [0x000f6] in .\Library\PackageCache\com.unity.ugui@1.0.0\Runtime\EventSystem\EventSystem.cs:530 + + diff --git a/Assets/ResWork/UI/Image/Hero Awaken.meta b/Assets/ResWork/UI/Image/Hero Awaken.meta new file mode 100644 index 000000000..7b2ff9cb7 --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b563954c2f05f44da043312d10cc2c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png new file mode 100644 index 000000000..56e5cd7de Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png.meta new file mode 100644 index 000000000..43a936c8f --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_DEX icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: e270a7e01804a7c4daa53c637852e7d8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png new file mode 100644 index 000000000..81da73f7f Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png.meta new file mode 100644 index 000000000..71f25f0c1 --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_INT icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: d93a9d6f45a6ddd4894cc583d8052565 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png new file mode 100644 index 000000000..53c8ecdaa Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png.meta new file mode 100644 index 000000000..496c69507 --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_LUK icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: c665aeca2326e8447987e7bbc9c7b08d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png new file mode 100644 index 000000000..184d00989 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png.meta new file mode 100644 index 000000000..1a70c46b7 --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_STR icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: ccea7ae921c59b842b029b2528444369 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png new file mode 100644 index 000000000..57e4cf8da Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png.meta new file mode 100644 index 000000000..0d7f06fe0 --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_button.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 446ecb32d450bdf46b1187b2d99254ab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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: 28, y: 0, z: 30, 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png new file mode 100644 index 000000000..171c386bf Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png.meta new file mode 100644 index 000000000..6d569865a --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar back.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 203175cd949d22c4291717ac68bc962a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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: 15, 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png new file mode 100644 index 000000000..fa8e25cfc Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png.meta new file mode 100644 index 000000000..923271f7f --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_guage bar color.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: e39ad356dbc0e9649b5cca8d00a0a8d5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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: 12, 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png new file mode 100644 index 000000000..633de59c0 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png.meta new file mode 100644 index 000000000..80495209a --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_star icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b48764112d07eec4491e5d63453c9a49 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png new file mode 100644 index 000000000..0d87bbcc0 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png.meta new file mode 100644 index 000000000..9c8eefbfc --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title back.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 8c910df4585efad43bd233bb61efe072 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png new file mode 100644 index 000000000..46112f559 Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png.meta new file mode 100644 index 000000000..5d42269ea --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_title icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b4feec83e9ca7ff449408367e4038876 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png b/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png new file mode 100644 index 000000000..28fe400dd Binary files /dev/null and b/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png differ diff --git a/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png.meta b/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png.meta new file mode 100644 index 000000000..7fb41912e --- /dev/null +++ b/Assets/ResWork/UI/Image/Hero Awaken/awaken_window.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: e2a7fd5f00846a44297d7a272c8fb5e7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/NoAtlasTexture/back ground image.png.meta b/Assets/ResWork/UI/NoAtlasTexture/back ground image.png.meta index 97cc1e4e3..e60318099 100644 --- a/Assets/ResWork/UI/NoAtlasTexture/back ground image.png.meta +++ b/Assets/ResWork/UI/NoAtlasTexture/back ground image.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/ResWork/UI/NoAtlasTexture/back ground light.png.meta b/Assets/ResWork/UI/NoAtlasTexture/back ground light.png.meta index 04d6ea357..c35849ff2 100644 --- a/Assets/ResWork/UI/NoAtlasTexture/back ground light.png.meta +++ b/Assets/ResWork/UI/NoAtlasTexture/back ground light.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/ResWork/UI/NoAtlasTexture/bottom light.png.meta b/Assets/ResWork/UI/NoAtlasTexture/bottom light.png.meta index 3229c1aa6..cfd0f0128 100644 --- a/Assets/ResWork/UI/NoAtlasTexture/bottom light.png.meta +++ b/Assets/ResWork/UI/NoAtlasTexture/bottom light.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCard.prefab b/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCard.prefab index 6307a6a76..6fbe80f38 100644 --- a/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCard.prefab +++ b/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCard.prefab @@ -32,12 +32,13 @@ RectTransform: m_Children: - {fileID: 3296152157140977511} - {fileID: 6904619321993005165} + - {fileID: 7110536794628296366} m_Father: {fileID: 5852490434265076672} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -75, y: -25} - m_SizeDelta: {x: 150, y: 50} + m_AnchoredPosition: {x: -154.5, y: -57.3} + m_SizeDelta: {x: 309, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3672026664770803817 CanvasRenderer: @@ -60,14 +61,89 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18431373, b: 0.25490198, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: 8c910df4585efad43bd233bb61efe072, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1146706132478193040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7110536794628296366} + - component: {fileID: 6798876975315182496} + - component: {fileID: 5080263712151011822} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7110536794628296366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146706132478193040} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1922603098054248003} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -237.3, y: 0} + m_SizeDelta: {x: 9, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6798876975315182496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146706132478193040} + m_CullTransparentMesh: 1 +--- !u!114 &5080263712151011822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146706132478193040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b4feec83e9ca7ff449408367e4038876, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -109,10 +185,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5852490434265076672} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -96.43} - m_SizeDelta: {x: 0, y: 192.86} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -214} + m_SizeDelta: {x: 123, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7209114331931366572 CanvasRenderer: @@ -135,14 +211,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2392157, g: 0.03529412, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: ccea7ae921c59b842b029b2528444369, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -189,8 +265,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -60, y: 31} - m_SizeDelta: {x: 100, y: 40} + m_AnchoredPosition: {x: -143.94, y: 42.6} + m_SizeDelta: {x: 173.55, y: 59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4587998222682491848 CanvasRenderer: @@ -213,15 +289,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18431373, b: 0.25490198, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 446ecb32d450bdf46b1187b2d99254ab, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -334,6 +410,96 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2583400128828498668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9080455703033189234} + - component: {fileID: 8248949863065888403} + - component: {fileID: 5352001057262028707} + - component: {fileID: 6667258030667450087} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9080455703033189234 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583400128828498668} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6992231752660304096} + m_Father: {fileID: 5949060851685020944} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8248949863065888403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583400128828498668} + m_CullTransparentMesh: 1 +--- !u!114 &5352001057262028707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583400128828498668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6667258030667450087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583400128828498668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &2764024899966450960 GameObject: m_ObjectHideFlags: 0 @@ -368,8 +534,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -1.2499847, y: 0} + m_SizeDelta: {x: -2.5, y: -4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2363576377926059936 CanvasRenderer: @@ -392,15 +558,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5803922, g: 0.86666673, b: 0.97647065, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e39ad356dbc0e9649b5cca8d00a0a8d5, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -409,152 +575,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2913507977761770961 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 243244222111250306} - - component: {fileID: 1354374389527370905} - - component: {fileID: 6783196011059907572} - - component: {fileID: 447263285024400733} - - component: {fileID: 4654603247691499058} - m_Layer: 5 - m_Name: btn_awaken - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &243244222111250306 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2913507977761770961} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1642199311891496687} - m_Father: {fileID: 5852490434265076672} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -60, y: 31} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1354374389527370905 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2913507977761770961} - m_CullTransparentMesh: 1 ---- !u!114 &6783196011059907572 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2913507977761770961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.23529413, g: 0.03529412, b: 0.03137255, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &447263285024400733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2913507977761770961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6783196011059907572} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1795356023270639513} - m_TargetAssemblyTypeName: PCAwakenCard, Assembly-CSharp - m_MethodName: OnClick_Awaken - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &4654603247691499058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2913507977761770961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3239332052342406944 GameObject: m_ObjectHideFlags: 0 @@ -623,7 +643,8 @@ MonoBehaviour: m_text: 000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -647,8 +668,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -657,7 +678,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -726,8 +747,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 78} - m_SizeDelta: {x: 250, y: 20} + m_AnchoredPosition: {x: 10.74, y: 12.5} + m_SizeDelta: {x: 294.46, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2779687976860854352 MonoBehaviour: @@ -776,7 +797,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.5 + m_Value: 0.326 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -814,7 +835,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -153, y: 0} + m_AnchoredPosition: {x: -139.8, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5365642571552916545 @@ -845,10 +866,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD798\uBBFC\uC9C0\uD589" + m_text: "\uD798" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -872,14 +894,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 55 + m_fontSizeBase: 55 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -914,154 +936,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4350901971865470550 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1642199311891496687} - - component: {fileID: 8893841815055686415} - - component: {fileID: 2232330843469060517} - - component: {fileID: 3698324673558184820} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1642199311891496687 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4350901971865470550} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 243244222111250306} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8893841815055686415 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4350901971865470550} - m_CullTransparentMesh: 1 ---- !u!114 &2232330843469060517 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4350901971865470550} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uAC01\uC131" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &3698324673558184820 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4350901971865470550} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 217 --- !u!1 &5544399826929308462 GameObject: m_ObjectHideFlags: 0 @@ -1096,16 +970,16 @@ RectTransform: - {fileID: 6229378925979576644} - {fileID: 1922603098054248003} - {fileID: 3611001103241445239} - - {fileID: 6992231752660304096} + - {fileID: 5949060851685020944} - {fileID: 5901629354347175684} - {fileID: 8874865963589611492} - - {fileID: 243244222111250306} + - {fileID: 3056985944752872380} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 500} + m_SizeDelta: {x: 445.88, y: 726.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1795356023270639513 MonoBehaviour: @@ -1119,6 +993,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dbc4f2e5429fb0a47a5271828fa935df, type: 3} m_Name: m_EditorClassIdentifier: + images: + - {fileID: 1812917524354844719} texts: - {fileID: 1691538175173366416} - {fileID: 3739651050876953349} @@ -1127,7 +1003,7 @@ MonoBehaviour: slider_acc: {fileID: 2779687976860854352} gos_btn: - {fileID: 2254111658239294320} - - {fileID: 2913507977761770961} + - {fileID: 7100222787875002958} m_MoneyForm: {fileID: 2101890025944392017} m_PCAwakenCard_Stat: {fileID: -8056178387154183266} --- !u!114 &-8056178387154183266 @@ -1142,7 +1018,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c6170c2ad05bc7648b5c10a4b4749297, type: 3} m_Name: m_EditorClassIdentifier: - m_ScrollRect: {fileID: 0} + m_ScrollRect: {fileID: 7114123149726223291} m_Content: {fileID: 7216458677739023356} go_card: {fileID: 2630838651598660092, guid: daf2e554278d5f54d82051334031a266, type: 3} --- !u!1 &5593657768310529414 @@ -1210,8 +1086,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1f4213f1679e640478b781d492e2283d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1255,8 +1131,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -121, y: 7} - m_SizeDelta: {x: 54, y: 51} + m_AnchoredPosition: {x: -155, y: 3.4} + m_SizeDelta: {x: 58, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8473217375889849832 CanvasRenderer: @@ -1279,14 +1155,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9960785, g: 0.9215687, b: 0.015686275, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7dd96a5ae7eb91d4d80a294a64af2e8f, type: 3} + m_Sprite: {fileID: 21300000, guid: b48764112d07eec4491e5d63453c9a49, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1364,14 +1240,15 @@ MonoBehaviour: m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4279707977 + m_fontColor: {r: 0.28627452, g: 0.16078432, b: 0.09019608, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1488,15 +1365,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18431373, b: 0.25490198, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 203175cd949d22c4291717ac68bc962a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1574,7 +1451,8 @@ MonoBehaviour: m_text: "\uAC15\uD654" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1598,8 +1476,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -1653,6 +1531,152 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 192 +--- !u!1 &7100222787875002958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3056985944752872380} + - component: {fileID: 144300666927787157} + - component: {fileID: 7454356242996596843} + - component: {fileID: 1352618491830898707} + - component: {fileID: 7833251747418901827} + m_Layer: 5 + m_Name: btn_Awaken + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3056985944752872380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7100222787875002958} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 634120568750156675} + m_Father: {fileID: 5852490434265076672} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -143.94, y: 42.6} + m_SizeDelta: {x: 173.55, y: 59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &144300666927787157 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7100222787875002958} + m_CullTransparentMesh: 1 +--- !u!114 &7454356242996596843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7100222787875002958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 446ecb32d450bdf46b1187b2d99254ab, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1352618491830898707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7100222787875002958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7454356242996596843} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1795356023270639513} + m_TargetAssemblyTypeName: PCAwakenCard, Assembly-CSharp + m_MethodName: OnClick_Awaken + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &7833251747418901827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7100222787875002958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7216458677739023356 GameObject: m_ObjectHideFlags: 0 @@ -1663,6 +1687,7 @@ GameObject: m_Component: - component: {fileID: 6992231752660304096} - component: {fileID: 2097652475094497470} + - component: {fileID: 9067577460744629271} m_Layer: 5 m_Name: layout m_TagString: Untagged @@ -1677,17 +1702,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7216458677739023356} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5852490434265076672} + m_Father: {fileID: 9080455703033189234} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.000015259, y: -66.36} - m_SizeDelta: {x: 300, y: 247} + m_AnchoredPosition: {x: 0.000015258789, y: 0.000015258789} + m_SizeDelta: {x: 300, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2097652475094497470 MonoBehaviour: @@ -1707,7 +1732,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 8 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -1715,6 +1740,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &9067577460744629271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7216458677739023356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &8538509757781054255 GameObject: m_ObjectHideFlags: 0 @@ -1747,9 +1786,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3611001103241445239} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -88, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -36.4, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1185011815391674648 @@ -1783,14 +1822,15 @@ MonoBehaviour: m_text: 000/000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1817,6 +1857,142 @@ MonoBehaviour: m_HorizontalAlignment: 4 m_VerticalAlignment: 4096 m_textAlignment: 65535 + m_characterSpacing: -3 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8708375759688367773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 634120568750156675} + - component: {fileID: 505437835460253539} + - component: {fileID: 6939547034489275899} + - component: {fileID: 3362171889375990460} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &634120568750156675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708375759688367773} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3056985944752872380} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &505437835460253539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708375759688367773} + m_CullTransparentMesh: 1 +--- !u!114 &6939547034489275899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708375759688367773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uAC01" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1849,6 +2025,108 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &3362171889375990460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8708375759688367773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 217 +--- !u!1 &8879281557895214689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5949060851685020944} + - component: {fileID: 904374875674523046} + - component: {fileID: 7114123149726223291} + - component: {fileID: 1999821939798034244} + m_Layer: 5 + m_Name: scrollview_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5949060851685020944 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879281557895214689} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9080455703033189234} + m_Father: {fileID: 5852490434265076672} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -133.57} + m_SizeDelta: {x: 300, y: 226.93} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &904374875674523046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879281557895214689} + m_CullTransparentMesh: 1 +--- !u!114 &7114123149726223291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879281557895214689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6992231752660304096} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 9080455703033189234} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1999821939798034244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879281557895214689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de42698a6e0344140bf433a75791511a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4189999888565715926 PrefabInstance: m_ObjectHideFlags: 0 @@ -1857,90 +2135,150 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5852490434265076672} m_Modifications: - - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 45.5 + objectReference: {fileID: 0} + - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_Name value: MoneyForm objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_text + value: 000 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_characterSpacing + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 56.2 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_SizeDelta.x value: 158 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_SizeDelta.y value: 36 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchoredPosition.x - value: 85 + value: 118.7 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_AnchoredPosition.y - value: 28 + value: 44.6 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1948,7 +2286,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} --- !u!114 &2101890025944392017 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, type: 3} + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} m_PrefabInstance: {fileID: 4189999888565715926} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1959,6 +2298,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &5901629354347175684 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} + m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} m_PrefabInstance: {fileID: 4189999888565715926} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCardStatCard.prefab b/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCardStatCard.prefab index e94ec55cc..0e5d7272f 100644 --- a/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCardStatCard.prefab +++ b/Assets/ResWork/UIPrefabs/PC/Awaken/PCAwakenCardStatCard.prefab @@ -120,7 +120,8 @@ MonoBehaviour: m_text: "\uC2A4\uD0EF 0 \uC99D\uAC00" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -144,8 +145,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -154,7 +155,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index cda10259e..0c046967f 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -42057,7 +42057,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0.0000480431, y: -52} - m_SizeDelta: {x: -919.92004, y: 0} + m_SizeDelta: {x: -1559.9199, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &9099795685657947352 MonoBehaviour: @@ -42818,7 +42818,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8112082934472033055 RectTransform: m_ObjectHideFlags: 0 @@ -74220,7 +74220,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 5 + m_Spacing: 18 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -75489,7 +75489,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 815eef24e5682c84e88d33499e2aa5eb, type: 3} + m_Sprite: {fileID: 21300000, guid: 227d697b8b852884281604e7ec720879, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -99418,8 +99418,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 19.12} - m_SizeDelta: {x: 0, y: -198.47} + m_AnchoredPosition: {x: 7.6400146, y: 36.97} + m_SizeDelta: {x: -77.59, y: -349.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &861550741941419308 CanvasRenderer: diff --git a/Assets/Script/Table/PC/table_awakenupgrade.cs b/Assets/Script/Table/PC/table_awakenupgrade.cs index 6d6793e6b..10e134049 100644 --- a/Assets/Script/Table/PC/table_awakenupgrade.cs +++ b/Assets/Script/Table/PC/table_awakenupgrade.cs @@ -81,6 +81,6 @@ public class table_awakenupgrade : table_missionbase base.Start(); } - public AwakenUpgradeTableData Get_Data_orNull(int lv) { return dic_Data[lv]; } + public AwakenUpgradeTableData Get_Data_orNull(int lv) { return dic_Data.ContainsKey(lv) ? dic_Data[lv] : null; } public List Get_DataList() { return tableDatas; } } \ No newline at end of file diff --git a/Assets/Script/UI/PC/Awaken/PCAwakenCard.cs b/Assets/Script/UI/PC/Awaken/PCAwakenCard.cs index 5a6c7bc76..e0b3b298e 100644 --- a/Assets/Script/UI/PC/Awaken/PCAwakenCard.cs +++ b/Assets/Script/UI/PC/Awaken/PCAwakenCard.cs @@ -1,12 +1,10 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; -using Unity.Collections.LowLevel.Unsafe; using UnityEngine; using UnityEngine.UI; public class PCAwakenCard : CardBase { + public Image[] images; // 0 스탯 public TextMeshProUGUI[] texts; // 0 스탯명, 1 누적 스탯, 2 각성 단계, 3 누적 강화 public Slider slider_acc; public GameObject[] gos_btn; // 0 강화버튼, 1 각성버튼 @@ -20,6 +18,7 @@ public class PCAwakenCard : CardBase { base.Set(_base); m_Stat = DSUtil.StringToEnum(_base.ToString()); + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite($"awaken_{m_Stat} icon"); Set_UI(); } @@ -36,7 +35,7 @@ public class PCAwakenCard : CardBase if (!DSUtil.CheckNull(m_AwakenUpgradeTableData)) { texts[0].text = MyText.Get_StatName(m_Stat); - texts[1].text = actorinfo.Get_Stat(m_Stat).ToString(); + texts[1].text = actorinfo.Get_Stat(m_Stat).ToString("N0"); texts[3].text = $"{exp}/{m_AwakenUpgradeTableData.n_MaxUpgradeLevel}"; slider_acc.value = DSUtil.Get_SliderValue((float)exp / m_AwakenUpgradeTableData.n_MaxUpgradeLevel); diff --git a/Assets/Script/UI/PC/Awaken/PCAwakenCardStatCard.cs b/Assets/Script/UI/PC/Awaken/PCAwakenCardStatCard.cs index 0fc7d6074..60528fc43 100644 --- a/Assets/Script/UI/PC/Awaken/PCAwakenCardStatCard.cs +++ b/Assets/Script/UI/PC/Awaken/PCAwakenCardStatCard.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; diff --git a/Assets/Script/UI/PC/PCUI.cs b/Assets/Script/UI/PC/PCUI.cs index 077bc6ae0..1b0376b7c 100644 --- a/Assets/Script/UI/PC/PCUI.cs +++ b/Assets/Script/UI/PC/PCUI.cs @@ -22,7 +22,7 @@ public class PCUI : BotMenuBase } m_Tab.Set(list_TabData); - PCInfoUI.Ins.m_PCInfoUI_Center.firstInit = false; + if (PCInfoUI.Ins) PCInfoUI.Ins.m_PCInfoUI_Center.firstInit = false; OnClick_Tab(); } diff --git a/Assets/Script/UI/PC/PCUI_LvInfo.cs b/Assets/Script/UI/PC/PCUI_LvInfo.cs index 8e60e0723..e12b505a9 100644 --- a/Assets/Script/UI/PC/PCUI_LvInfo.cs +++ b/Assets/Script/UI/PC/PCUI_LvInfo.cs @@ -18,6 +18,6 @@ public class PCUI_LvInfo : MonoBehaviourSingletonTemplate texts[0].text = classData.Get_JobName(); texts[1].text = $"Lv. {sdata.PC.Lv}"; texts[2].text = $"Exp {DSUtil.GetCommaText_N2(sdata.PC.Get_ExpSliderValue() * 100f)}%"; - texts[3].text = classData.e_BattleType.ToString(); + if (texts.Length > 3) texts[3].text = classData.e_BattleType.ToString(); } } \ No newline at end of file