From d20f04da2fc54140fb3a0c9d05f2ea26c5ddb07c Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 11 八月 2025 18:15:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Config/Hero.txt | 128 ++++++++++++------------
UI/HeroTrainWin.prefab | 89 +----------------
Config/NPC.txt | 24 ++--
UIComp/GiftBaseCell.prefab | 4
Config/Language.txt | 3
5 files changed, 86 insertions(+), 162 deletions(-)
diff --git a/Config/Hero.txt b/Config/Hero.txt
index 7a1fd38..7713cc0 100644
--- a/Config/Hero.txt
+++ b/Config/Hero.txt
@@ -1,67 +1,67 @@
int string int int int int int[] int int int int int string int[] float string
HeroID Name Country Quality Class Position SkinIDList AtkSkillID AngerSkillID AtkInheritPer DefInheritPer HPInheritPer BatAttrDict FetterIDList UIScale Desc
姝﹀皢鐗╁搧ID 姝﹀皢鍚� 鍥藉 鑻遍泟鍝佽川 鑻遍泟鑱屼笟 鎺ㄨ崘浣嶇疆 鐨偆ID鍒楄〃 鏅敾鎶�鑳絀D 鎬掓皵鎶�鑳絀D 鏀诲嚮缁ф壙 闃插尽缁ф壙 鐢熷懡缁ф壙 鍏朵粬鎴樻枟灞炴�у瓧鍏� 鎵�灞炵殑缇佺粖鐨処D UI鐣岄潰涓婄殑缂╂斁姣斾緥 鐗圭偣璇存槑
-510001 鏇瑰┐ 1 1 2 1 5100010 100101 100102 105 75 90 {} 0.8 鐖嗗彂鎺у埗
-510002 涔愯繘 1 2 2 2 5100020 100201 100202 105 80 100 {} 0.8 杩戞垬闂伩
-510003 搴炲痉 1 2 1 1 5100030 100301 100302 95 80 110 {} 0.8 鐖嗗彂鎺у埗
-510004 鍗炲か浜� 1 3 2 1 5100040 100401 100402 115 85 100 {} 0.8 杩戞垬闂伩
-510005 浜庣 1 3 4 1 5100050 100501 100502 105 80 110 {} 0.8 鐖嗗彂鎺у埗
-510006 鏇硅蕉 1 3 2 1 5100060 100601 100602 115 85 100 {} 0.8 杩戞垬闂伩
-510007 鏉庡吀 1 3 1 1 5100070 100701 100702 100 85 115 {} 0.8 鐖嗗彂鎺у埗
-510008 钄℃枃濮� 1 4 3 1 5100080 100801 100802 115 90 110 {} 0.8 杩戞垬闂伩
-510009 璐捐 1 4 2 1 5100090 100901 100902 120 90 105 {} 0.8 鐖嗗彂鎺у埗
-510010 鐜嬪紓 1 4 2 1 5100100 101001 101002 115 90 110 {} 0.8 杩戞垬闂伩
-510011 鐜嬪厓濮� 1 4 4 1 5100110 101101 101102 115 90 110 {} 0.8 鐖嗗彂鎺у埗
-510012 鍙搁┈鎳� 1 5 2 1 5100120 101201 101202 125 95 110 {} 0.8 杩戞垬闂伩
-510013 鐢勫畵 1 5 3 1 5100130 101301 101302 120 95 115 {} 0.8 鐖嗗彂鎺у埗
-510014 鏇规搷 1 5 2 1 5100140 101401 101402 120 95 115 {} 1 0.8 杩戞垬闂伩
-510015 鏇逛粊 1 5 1 1 5100150 101501 101502 110 95 125 {} 1 0.8 鐖嗗彂鎺у埗
-510016 閮槈 1 5 2 1 5100160 101601 101602 125 95 110 {} 0.8 杩戞垬闂伩
-520001 绯滅 2 1 3 1 5200010 200101 200102 100 75 95 {} 0.8 鐖嗗彂鎺у埗
-520002 椴嶄笁濞� 2 2 2 1 5200020 200201 200202 105 80 100 {} 0.8 杩戞垬闂伩
-520003 鍛ㄤ粨 2 2 1 1 5200030 200301 200302 95 80 110 {} 0.8 鐖嗗彂鎺у埗
-520004 璇歌憶鏋� 2 3 2 1 5200040 200401 200402 115 85 100 {} 0.8 杩戞垬闂伩
-520005 鍏冲叴 2 3 4 1 5200050 200501 200502 105 85 110 {} 0.8 鐖嗗彂鎺у埗
-520006 鐢樺か浜� 2 3 3 1 5200060 200601 200602 110 85 105 {} 0.8 杩戞垬闂伩
-520007 寮犳槦褰� 2 3 1 1 5200070 200701 200702 100 85 115 {} 0.8 鐖嗗彂鎺у埗
-520008 鍏抽摱灞� 2 4 2 1 5200080 200801 200802 115 90 110 {} 0.8 杩戞垬闂伩
-520009 搴炵粺 2 4 2 1 5200090 200901 200902 120 90 105 {} 0.8 鐖嗗彂鎺у埗
-520010 璧典簯 2 4 2 1 5200100 201001 201002 115 90 110 {} 0.8 杩戞垬闂伩
-520011 榛勬湀鑻� 2 4 4 1 5200110 201101 201102 115 90 110 {} 0.8 鐖嗗彂鎺у埗
-520012 璇歌憶浜� 2 5 2 1 5200120 201201 201202 125 95 110 {} 0.8 杩戞垬闂伩
-520013 鍒樺 2 5 3 1 5200130 201301 201302 115 95 120 {} 4 0.8 鐖嗗彂鎺у埗
-520014 鍏崇窘 2 5 2 1 5200140 201401 201402 120 95 115 {} 4 0.8 杩戞垬闂伩
-520015 寮犻 2 5 1 1 5200150 201501 201502 110 95 125 {} 4 0.8 鐖嗗彂鎺у埗
-520016 椹秴 2 5 2 1 5200160 201601 201602 120 95 115 {} 4 0.8 杩戞垬闂伩
-530001 娼樼拫 3 1 2 1 5300010 300101 300102 100 75 95 {} 0.8 鐖嗗彂鎺у埗
-530002 鍚村浗澶� 3 2 3 1 5300020 300201 300202 105 80 100 {} 0.8 杩戞垬闂伩
-530003 鍑岀粺 3 2 2 1 5300030 300301 300302 105 80 100 {} 0.8 鐖嗗彂鎺у埗
-530004 鐢樺畞 3 3 2 1 5300040 300401 300402 110 85 105 {} 0.8 杩戞垬闂伩
-530005 鏈辨 3 3 4 1 5300050 300501 300502 105 85 110 {} 0.8 鐖嗗彂鎺у埗
-530006 鍙搁┈寰� 3 3 4 1 5300060 300601 300602 110 85 105 {} 0.8 杩戞垬闂伩
-530007 涓佸 3 3 1 1 5300070 300701 300702 100 85 115 {} 0.8 鐖嗗彂鎺у埗
-530008 瀛欓瞾鑲� 3 4 2 1 5300080 300801 300802 120 90 105 {} 0.8 杩戞垬闂伩
-530009 瀛欑瓥 3 4 2 1 5300090 300901 300902 115 90 110 {} 0.8 鐖嗗彂鎺у埗
-530010 瀛欏皻棣� 3 4 2 1 5300100 301001 301002 120 90 105 {} 0.8 杩戞垬闂伩
-530011 澶т箶 3 4 2 1 5300110 301101 301102 115 90 110 {} 0.8 鐖嗗彂鎺у埗
-530012 鍛ㄧ憸 3 5 2 1 5300120 301201 301202 125 95 110 {} 0.8 杩戞垬闂伩
-530013 灏忎箶 3 5 3 1 5300130 301301 301302 120 95 115 {} 0.8 鐖嗗彂鎺у埗
-530014 姝ョ粌甯� 3 5 2 1 5300140 301401 301402 120 95 115 {} 0.8 杩戞垬闂伩
-530015 瀛欏潥 3 5 1 1 5300150 301501 301502 110 95 125 {} 0.8 鐖嗗彂鎺у埗
-530016 闄嗛�� 3 5 2 1 5300160 301601 301602 120 95 115 {} 0.8 杩戞垬闂伩
-540001 绾伒 4 1 2 1 5400010 400101 400102 100 75 95 {} 0.8 鐖嗗彂鎺у埗
-540002 閮睖 4 2 2 1 5400020 400201 400202 105 80 100 {} 0.8 杩戞垬闂伩
-540003 鏉庡倳 4 2 2 1 5400030 400301 400302 105 80 100 {} 0.8 鐖嗗彂鎺у埗
-540004 寮犲疂 4 3 3 1 5400040 400401 400402 110 85 105 {} 0.8 杩戞垬闂伩
-540005 闊╅亗 4 3 2 1 5400050 400501 400502 110 85 105 {} 0.8 鐖嗗彂鎺у埗
-540006 瀛熻幏 4 3 1 1 5400060 400601 400602 100 85 115 {} 0.8 杩戞垬闂伩
-540007 绁濊瀺 4 3 2 1 5400070 400701 400702 115 85 100 {} 0.8 鐖嗗彂鎺у埗
-540008 浣曞お鍚� 4 4 4 1 5400080 400801 400802 115 90 110 {} 0.8 杩戞垬闂伩
-540009 钁ｇ櫧 4 4 2 1 5400090 400901 400902 115 90 110 {} 0.8 鐖嗗彂鎺у埗
-540010 鍗戝讥鍛� 4 4 2 1 5400100 401001 401002 115 90 110 {} 0.8 杩戞垬闂伩
-540011 钁ｅ崜 4 4 1 1 5400110 401101 401102 105 90 120 {} 0.8 鐖嗗彂鎺у埗
-540012 璨傝潐 4 5 2 1 5400120 401201 401202 125 95 110 {} 0.8 杩戞垬闂伩
-540013 鍚曠幉缁� 4 5 2 1 5400130 401301 401302 120 95 115 {} 0.8 鐖嗗彂鎺у埗
-540014 鍚曞竷 4 5 1 1 5400140 401401 401402 110 95 125 {} 0.8 杩戞垬闂伩
-540015 寮犺 4 5 4 1 5400150 401501 401502 120 95 115 {} 0.8 鐖嗗彂鎺у埗
-540016 宸︽厛 4 5 3 1 5400160 401601 401602 120 95 115 {} 0.8 杩戞垬闂伩
+510001 鏇瑰┐ 1 1 2 1 5100010 100101 100102 10500 7500 9000 {} 0.8 鐖嗗彂鎺у埗
+510002 涔愯繘 1 2 2 2 5100020 100201 100202 10500 8000 10000 {} 0.8 杩戞垬闂伩
+510003 搴炲痉 1 2 1 1 5100030 100301 100302 9500 8000 11000 {} 0.8 鐖嗗彂鎺у埗
+510004 鍗炲か浜� 1 3 2 1 5100040 100401 100402 11500 8500 10000 {} 0.8 杩戞垬闂伩
+510005 浜庣 1 3 4 1 5100050 100501 100502 10500 8000 11000 {} 0.8 鐖嗗彂鎺у埗
+510006 鏇硅蕉 1 3 2 1 5100060 100601 100602 11500 8500 10000 {} 0.8 杩戞垬闂伩
+510007 鏉庡吀 1 3 1 1 5100070 100701 100702 10000 8500 11500 {} 0.8 鐖嗗彂鎺у埗
+510008 钄℃枃濮� 1 4 3 1 5100080 100801 100802 11500 9000 11000 {} 0.8 杩戞垬闂伩
+510009 璐捐 1 4 2 1 5100090 100901 100902 12000 9000 10500 {} 0.8 鐖嗗彂鎺у埗
+510010 鐜嬪紓 1 4 2 1 5100100 101001 101002 11500 9000 11000 {} 0.8 杩戞垬闂伩
+510011 鐜嬪厓濮� 1 4 4 1 5100110 101101 101102 11500 9000 11000 {} 0.8 鐖嗗彂鎺у埗
+510012 鍙搁┈鎳� 1 5 2 1 5100120 101201 101202 12500 9500 11000 {} 0.8 杩戞垬闂伩
+510013 鐢勫畵 1 5 3 1 5100130 101301 101302 12000 9500 11500 {} 0.8 鐖嗗彂鎺у埗
+510014 鏇规搷 1 5 2 1 5100140 101401 101402 12000 9500 11500 {} 1 0.8 杩戞垬闂伩
+510015 鏇逛粊 1 5 1 1 5100150 101501 101502 11000 9500 12500 {} 1 0.8 鐖嗗彂鎺у埗
+510016 閮槈 1 5 2 1 5100160 101601 101602 12500 9500 11000 {} 0.8 杩戞垬闂伩
+520001 绯滅 2 1 3 1 5200010 200101 200102 10000 7500 9500 {} 0.8 鐖嗗彂鎺у埗
+520002 椴嶄笁濞� 2 2 2 1 5200020 200201 200202 10500 8000 10000 {} 0.8 杩戞垬闂伩
+520003 鍛ㄤ粨 2 2 1 1 5200030 200301 200302 9500 8000 11000 {} 0.8 鐖嗗彂鎺у埗
+520004 璇歌憶鏋� 2 3 2 1 5200040 200401 200402 11500 8500 10000 {} 0.8 杩戞垬闂伩
+520005 鍏冲叴 2 3 4 1 5200050 200501 200502 10500 8500 11000 {} 0.8 鐖嗗彂鎺у埗
+520006 鐢樺か浜� 2 3 3 1 5200060 200601 200602 11000 8500 10500 {} 0.8 杩戞垬闂伩
+520007 寮犳槦褰� 2 3 1 1 5200070 200701 200702 10000 8500 11500 {} 0.8 鐖嗗彂鎺у埗
+520008 鍏抽摱灞� 2 4 2 1 5200080 200801 200802 11500 9000 11000 {} 0.8 杩戞垬闂伩
+520009 搴炵粺 2 4 2 1 5200090 200901 200902 12000 9000 10500 {} 0.8 鐖嗗彂鎺у埗
+520010 璧典簯 2 4 2 1 5200100 201001 201002 11500 9000 11000 {} 0.8 杩戞垬闂伩
+520011 榛勬湀鑻� 2 4 4 1 5200110 201101 201102 11500 9000 11000 {} 0.8 鐖嗗彂鎺у埗
+520012 璇歌憶浜� 2 5 2 1 5200120 201201 201202 12500 9500 11000 {} 0.8 杩戞垬闂伩
+520013 鍒樺 2 5 3 1 5200130 201301 201302 11500 9500 12000 {} 4 0.8 鐖嗗彂鎺у埗
+520014 鍏崇窘 2 5 2 1 5200140 201401 201402 12000 9500 11500 {} 4 0.8 杩戞垬闂伩
+520015 寮犻 2 5 1 1 5200150 201501 201502 11000 9500 12500 {} 4 0.8 鐖嗗彂鎺у埗
+520016 椹秴 2 5 2 1 5200160 201601 201602 12000 9500 11500 {} 4 0.8 杩戞垬闂伩
+530001 娼樼拫 3 1 2 1 5300010 300101 300102 10000 7500 9500 {} 0.8 鐖嗗彂鎺у埗
+530002 鍚村浗澶� 3 2 3 1 5300020 300201 300202 10500 8000 10000 {} 0.8 杩戞垬闂伩
+530003 鍑岀粺 3 2 2 1 5300030 300301 300302 10500 8000 10000 {} 0.8 鐖嗗彂鎺у埗
+530004 鐢樺畞 3 3 2 1 5300040 300401 300402 11000 8500 10500 {} 0.8 杩戞垬闂伩
+530005 鏈辨 3 3 4 1 5300050 300501 300502 10500 8500 11000 {} 0.8 鐖嗗彂鎺у埗
+530006 鍙搁┈寰� 3 3 4 1 5300060 300601 300602 11000 8500 10500 {} 0.8 杩戞垬闂伩
+530007 涓佸 3 3 1 1 5300070 300701 300702 10000 8500 11500 {} 0.8 鐖嗗彂鎺у埗
+530008 瀛欓瞾鑲� 3 4 2 1 5300080 300801 300802 12000 9000 10500 {} 0.8 杩戞垬闂伩
+530009 瀛欑瓥 3 4 2 1 5300090 300901 300902 11500 9000 11000 {} 0.8 鐖嗗彂鎺у埗
+530010 瀛欏皻棣� 3 4 2 1 5300100 301001 301002 12000 9000 10500 {} 0.8 杩戞垬闂伩
+530011 澶т箶 3 4 2 1 5300110 301101 301102 11500 9000 11000 {} 0.8 鐖嗗彂鎺у埗
+530012 鍛ㄧ憸 3 5 2 1 5300120 301201 301202 12500 9500 11000 {} 0.8 杩戞垬闂伩
+530013 灏忎箶 3 5 3 1 5300130 301301 301302 12000 9500 11500 {} 0.8 鐖嗗彂鎺у埗
+530014 姝ョ粌甯� 3 5 2 1 5300140 301401 301402 12000 9500 11500 {} 0.8 杩戞垬闂伩
+530015 瀛欏潥 3 5 1 1 5300150 301501 301502 11000 9500 12500 {} 0.8 鐖嗗彂鎺у埗
+530016 闄嗛�� 3 5 2 1 5300160 301601 301602 12000 9500 11500 {} 0.8 杩戞垬闂伩
+540001 绾伒 4 1 2 1 5400010 400101 400102 10000 7500 9500 {} 0.8 鐖嗗彂鎺у埗
+540002 閮睖 4 2 2 1 5400020 400201 400202 10500 8000 10000 {} 0.8 杩戞垬闂伩
+540003 鏉庡倳 4 2 2 1 5400030 400301 400302 10500 8000 10000 {} 0.8 鐖嗗彂鎺у埗
+540004 寮犲疂 4 3 3 1 5400040 400401 400402 11000 8500 10500 {} 0.8 杩戞垬闂伩
+540005 闊╅亗 4 3 2 1 5400050 400501 400502 11000 8500 10500 {} 0.8 鐖嗗彂鎺у埗
+540006 瀛熻幏 4 3 1 1 5400060 400601 400602 10000 8500 11500 {} 0.8 杩戞垬闂伩
+540007 绁濊瀺 4 3 2 1 5400070 400701 400702 11500 8500 10000 {} 0.8 鐖嗗彂鎺у埗
+540008 浣曞お鍚� 4 4 4 1 5400080 400801 400802 11500 9000 11000 {} 0.8 杩戞垬闂伩
+540009 钁ｇ櫧 4 4 2 1 5400090 400901 400902 11500 9000 11000 {} 0.8 鐖嗗彂鎺у埗
+540010 鍗戝讥鍛� 4 4 2 1 5400100 401001 401002 11500 9000 11000 {} 0.8 杩戞垬闂伩
+540011 钁ｅ崜 4 4 1 1 5400110 401101 401102 10500 9000 12000 {} 0.8 鐖嗗彂鎺у埗
+540012 璨傝潐 4 5 2 1 5400120 401201 401202 12500 9500 11000 {} 0.8 杩戞垬闂伩
+540013 鍚曠幉缁� 4 5 2 1 5400130 401301 401302 12000 9500 11500 {} 0.8 鐖嗗彂鎺у埗
+540014 鍚曞竷 4 5 1 1 5400140 401401 401402 11000 9500 12500 {} 0.8 杩戞垬闂伩
+540015 寮犺 4 5 4 1 5400150 401501 401502 12000 9500 11500 {} 0.8 鐖嗗彂鎺у埗
+540016 宸︽厛 4 5 3 1 5400160 401601 401602 12000 9500 11500 {} 0.8 杩戞垬闂伩
diff --git a/Config/Language.txt b/Config/Language.txt
index a8669a7..92e1002 100644
--- a/Config/Language.txt
+++ b/Config/Language.txt
@@ -169,7 +169,7 @@
herocard47 姝﹀皢缁ф壙涓烘灏嗕粠鍏ㄤ綋灞炴�х户鎴愭瘮渚嬶紝鎴樻枟灞炴�с�佹垬鏂楁姉鎬с�佺壒娈婂睘鎬х户鎵挎瘮渚嬩负100%
herocard48 涓诲叕鍔犳垚涓烘灏嗗鍏ㄤ綋灞炴�у姞鎴愭瘮渚嬶紝涓婇樀鐢熸晥
herocard49 <a>姝﹀皢缁ф壙锛�</a>
-herocard50 <a>涓婇樀鍔犳垚锛�</a>
+herocard50 <a>涓诲叕鍔犳垚锛�</a>
herocard51 娼滆兘
herocard52 鍩虹灞炴��
herocard53 鎴樻枟灞炴��
@@ -182,3 +182,4 @@
herocard60 涓诲叕闃插尽
herocard61 涓诲叕鐢熷懡
herocard62 鑾峰彇閫斿緞
+herocard63 <b>绐佺牬+{0}锛�</b> {1}
diff --git a/Config/NPC.txt b/Config/NPC.txt
index 1e0510a..305d49a 100644
--- a/Config/NPC.txt
+++ b/Config/NPC.txt
@@ -1,15 +1,15 @@
int string int int int int float
NPCID NPCName Country AtkDistType LV SkinID ModelScale
缂栧彿 鍚嶇О 鍥藉 杩滆繎绫诲瀷 绛夌骇 澶栬 妯″瀷缂╂斁
-10101001 鏈哄叧鍌�鍎� 0 0 1 1
-10101002 澶ц�冲鐙� 0 0 2 1
-20103001 铚樿洓濂崇殗 0 2 10 1
-20103002 鍡滄捣鐙傞波 0 1 11 1
-20103003 鍙ゅ鐭冲法浜� 0 1 12 1
-20103004 娈嬫毚娴锋�� 0 2 13 1
-20103005 瀵掑啺鍙ゅ 0 1 14 1
-20103006 缈绘按濡栭緳 0 1 15 1
-20103007 娣辨捣涔嬬帇 0 0 16 1
-20203005 鑽掓紶鍖 0 1 17 1
-20203006 杩峰够涔嬬伒 0 2 18 1
-20203007 鑽掓紶宸ㄥ吔 0 1 19 1
+10101001 鏈哄叧鍌�鍎� 0 0 1 5100010 1
+10101002 澶ц�冲鐙� 0 0 2 5100010 1
+20103001 铚樿洓濂崇殗 0 2 10 5100010 1
+20103002 鍡滄捣鐙傞波 0 1 11 5100010 1
+20103003 鍙ゅ鐭冲法浜� 0 1 12 5100010 1
+20103004 娈嬫毚娴锋�� 0 2 13 5100010 1
+20103005 瀵掑啺鍙ゅ 0 1 14 5100010 1
+20103006 缈绘按濡栭緳 0 1 15 5100010 1
+20103007 娣辨捣涔嬬帇 0 0 16 5100010 1
+20203005 鑽掓紶鍖 0 1 17 5100010 1
+20203006 杩峰够涔嬬伒 0 2 18 5100010 1
+20203007 鑽掓紶宸ㄥ吔 0 1 19 5100010 1
diff --git a/UI/HeroTrainWin.prefab b/UI/HeroTrainWin.prefab
index c118e46..76fe76b 100644
--- a/UI/HeroTrainWin.prefab
+++ b/UI/HeroTrainWin.prefab
@@ -196,6 +196,7 @@
lvupBtnText: {fileID: 8397760656086566472}
lvupBtn: {fileID: 4633310933911166077}
allAttrBtn: {fileID: 4127479399116486034}
+ allPotentialText: {fileID: 8678507362496717342}
--- !u!1 &75046844286006551
GameObject:
m_ObjectHideFlags: 0
@@ -1882,7 +1883,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 350, y: -737.8345}
+ m_AnchoredPosition: {x: 350, y: -712.8345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4141181799006560916
@@ -4209,11 +4210,11 @@
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
- m_LineSpacing: 1.2
- m_Text: "\u4E3B\u516C\u52A0\u6210\uFF1A\n"
+ m_LineSpacing: 1.4
+ m_Text: "\u4E3B\u516C\u52A0\u6210\uFF1A"
m_IsKey: 0
m_KeyName:
- m_ColorType: 0
+ m_ColorType: 7
m_BGColorType: 0
--- !u!114 &9120888885551695837
MonoBehaviour:
@@ -6149,7 +6150,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 350, y: -636.8345}
+ m_AnchoredPosition: {x: 350, y: -624.3345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5353703778975737344
@@ -6230,83 +6231,6 @@
m_AnchoredPosition: {x: 165.3383, y: -139.5}
m_SizeDelta: {x: 86, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &3663296274264022890
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4134611999759387036}
- - component: {fileID: 3372337311705143254}
- - component: {fileID: 6275317493687168596}
- m_Layer: 5
- m_Name: herotrain_img_146
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4134611999759387036
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3663296274264022890}
- 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: 1761340359071083940}
- 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: 90.5, y: 1.5}
- m_SizeDelta: {x: 37, y: 38}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3372337311705143254
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3663296274264022890}
- m_CullTransparentMesh: 1
---- !u!114 &6275317493687168596
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3663296274264022890}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5eec31867c0c74f4aa2eeade969eec0e, 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: 24b742d74c60d044c87c1d4923c4faf9, 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
- m_Gray: 0
- m_IconKey:
--- !u!1 &3770738208841490963
GameObject:
m_ObjectHideFlags: 0
@@ -9254,7 +9178,6 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3196799567364174702}
- - {fileID: 4134611999759387036}
m_Father: {fileID: 1265840974697868622}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
diff --git a/UIComp/GiftBaseCell.prefab b/UIComp/GiftBaseCell.prefab
index ff986ec..e803b1c 100644
--- a/UIComp/GiftBaseCell.prefab
+++ b/UIComp/GiftBaseCell.prefab
@@ -101,7 +101,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &2289338208982149319
RectTransform:
m_ObjectHideFlags: 0
@@ -339,7 +339,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1902078991610973036
RectTransform:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0