From d1e880bec354744dedacd61ab44af01849231882 Mon Sep 17 00:00:00 2001
From: gwj <379014410@qq.com>
Date: 星期五, 19 九月 2025 16:14:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/HeroLVBreakSuccessWin.prefab | 112 +++++++++
UI/HeroBestWin.prefab | 18
Config/CTG.txt | 3
UI/FullScreenBattleWin.prefab | 6
UI/HeroListWin.prefab | 2
UI/HeroCollectionWin.prefab | 2
Config/OrderInfo.txt | 4
UI/HeroTrainWin.prefab | 24 +-
Config/FuncConfig.txt | 3
Battle/Prefabs/BattleRootNode.prefab | 223 ++++++++++++++++++-
UI/HeroGiftWashWin.prefab | 37 ++-
UI/HeroLVBreakWin.prefab | 172 +++++++++++++--
Config/Skill.txt | 5
13 files changed, 517 insertions(+), 94 deletions(-)
diff --git a/Battle/Prefabs/BattleRootNode.prefab b/Battle/Prefabs/BattleRootNode.prefab
index fda1c24..640ecc5 100644
--- a/Battle/Prefabs/BattleRootNode.prefab
+++ b/Battle/Prefabs/BattleRootNode.prefab
@@ -182,6 +182,46 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1955379325107596191
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6335577651418102169}
+ m_Layer: 5
+ m_Name: battlenode
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6335577651418102169
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1955379325107596191}
+ 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: 5521273624278094336}
+ - {fileID: 7065582698912777848}
+ - {fileID: 175482138899157131}
+ - {fileID: 3230798976993466935}
+ - {fileID: 8080636801987895324}
+ m_Father: {fileID: 2610348819904339951}
+ 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: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2117733420619445356
GameObject:
m_ObjectHideFlags: 0
@@ -282,11 +322,11 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5056809326870738701}
- - {fileID: 5521273624278094336}
- - {fileID: 7065582698912777848}
- - {fileID: 175482138899157131}
- - {fileID: 3230798976993466935}
- - {fileID: 8080636801987895324}
+ - {fileID: 6601719774650107310}
+ - {fileID: 2775740563243893854}
+ - {fileID: 6335577651418102169}
+ - {fileID: 4967262652072425624}
+ - {fileID: 541575910266420155}
- {fileID: 5457806422418689570}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -310,6 +350,11 @@
redTeamNode: {fileID: 5521273624278094336}
blueTeamNode: {fileID: 7065582698912777848}
imgBackground: {fileID: 3630042615940608664}
+ bgPos1: {fileID: 6601719774650107310}
+ bgPos2: {fileID: 2775740563243893854}
+ battleNode: {fileID: 6335577651418102169}
+ battleNodePos1: {fileID: 4967262652072425624}
+ battleNodePos2: {fileID: 541575910266420155}
skillBackNode: {fileID: 175482138899157131}
skillFrontNode: {fileID: 8080636801987895324}
skillMaskNode: {fileID: 4095416971228565534}
@@ -384,7 +429,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 750, y: 1334}
+ m_SizeDelta: {x: 4000, y: 4000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6840243593662049867
CanvasRenderer:
@@ -453,7 +498,7 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2653421991260683682}
- m_Father: {fileID: 2610348819904339951}
+ m_Father: {fileID: 6335577651418102169}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -483,6 +528,41 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4126500777811061693}
+ 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: 6335577651418102169}
+ 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: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4276884307082582683
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2775740563243893854}
+ m_Layer: 5
+ m_Name: bgpos2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2775740563243893854
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4276884307082582683}
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}
@@ -494,7 +574,7 @@
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0}
--- !u!1 &4821505431668143750
GameObject:
m_ObjectHideFlags: 0
@@ -518,12 +598,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4821505431668143750}
- 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: 2610348819904339951}
+ m_Father: {fileID: 6335577651418102169}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -562,11 +642,11 @@
m_Children: []
m_Father: {fileID: 2610348819904339951}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: -335}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 415}
m_SizeDelta: {x: 750, y: 1600}
- m_Pivot: {x: 0.5, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4629097904417186064
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -672,6 +752,41 @@
m_AnchoredPosition: {x: -130, y: -180}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5485675608166708097
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 541575910266420155}
+ m_Layer: 5
+ m_Name: battlenodepos2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &541575910266420155
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5485675608166708097}
+ 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: 2610348819904339951}
+ 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: -360}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5517101789064705313
GameObject:
m_ObjectHideFlags: 0
@@ -695,7 +810,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5517101789064705313}
- 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
@@ -707,7 +822,7 @@
- {fileID: 6361242292444333122}
- {fileID: 4387904871119163377}
- {fileID: 5876846821764626060}
- m_Father: {fileID: 2610348819904339951}
+ m_Father: {fileID: 6335577651418102169}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -737,7 +852,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5716843117096252015}
- 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
@@ -900,6 +1015,41 @@
y: 0
width: 1
height: 1
+--- !u!1 &6195941106233338824
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4967262652072425624}
+ m_Layer: 5
+ m_Name: battlenodepos1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4967262652072425624
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6195941106233338824}
+ 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: 2610348819904339951}
+ 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: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6333665137478379820
GameObject:
m_ObjectHideFlags: 0
@@ -923,7 +1073,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6333665137478379820}
- 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
@@ -935,7 +1085,7 @@
- {fileID: 5355502307247263375}
- {fileID: 788343784761955289}
- {fileID: 167780508999911467}
- m_Father: {fileID: 2610348819904339951}
+ m_Father: {fileID: 6335577651418102169}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1201,6 +1351,41 @@
m_AnchoredPosition: {x: 0, y: 180}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7760062150813223693
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6601719774650107310}
+ m_Layer: 5
+ m_Name: bgpos1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6601719774650107310
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7760062150813223693}
+ 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: 2610348819904339951}
+ 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: 500}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7886115065398075781
GameObject:
m_ObjectHideFlags: 0
diff --git a/Config/CTG.txt b/Config/CTG.txt
index 887e764..3e578ad 100644
--- a/Config/CTG.txt
+++ b/Config/CTG.txt
@@ -1,8 +1,7 @@
int string int int int int int int int int int string int[][] string int int
RecordID Title VipLevel TotalBuyCount DailyBuyCount WeekBuyCount MonthBuyCount MoneyType GainGold GainGoldPaper FirstGoldPaperPrize GainItemList SelectItemInfo Icon PayType Percentage
璁板綍ID 鍟嗗搧鍚嶇О vip绛夌骇闄愬埗 鎬婚檺璐鏁� 姣忔棩闄愯喘娆℃暟 姣忓懆闄愯喘娆℃暟 姣忔湀闄愯喘娆℃暟 鑾峰緱璐у竵绫诲瀷 鑾峰緱璐у竵鏁伴噺 濂栧姳璐у竵鏁伴噺 棣栨鍏呭�艰妗ｄ綅璧犻�佷粰鐜� 鑾峰緱鐗╁搧鍒楄〃锛屼笌娲诲姩涓撶敤鐗╁搧閰嶇疆浜岄�変竴 鑷�夌ぜ鍖呯墿鍝佷俊鎭� 鍏呭�煎簳鍥� 鍏呭�肩被鍨� 浼樻儬鐧惧垎姣�
-1 娣橀噾鍛ㄥ崱 0 0 0 0 0 0 0 0 [] 0 100
-2 娣橀噾鏈堝崱 0 0 0 0 0 0 0 0 [] 0 150
+1 鑷姩娣橀噾 0 0 0 0 0 0 0 0 [] 0 0
100 棣栧厖 0 1 0 0 0 0 0 0 [] 1 0
101 60浠欑帀 0 0 0 0 1 60 6 60 [] CTG_6 2 0
102 300浠欑帀 0 0 0 0 1 300 30 300 [] CTG_30 2 0
diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt
index f64f915..90b1bd5 100644
--- a/Config/FuncConfig.txt
+++ b/Config/FuncConfig.txt
@@ -44,5 +44,8 @@
EquipTip [0,951,952,953,954,955,956,957,958,959,960,961,962]
InvestCost {} {} {"7":[101],"12":[102]} {} {}
AutoGuaji [1,10,16,23,30] 1016 102
+GoldRush 12|12 60|60 10
+GoldRushAuto [3, 30] [[1]]
+GoldRushRefresh 1 42 [10,20,30,40,50] 30 {}
HeroCall 3
HeroRedpoint [7,8,9]
diff --git a/Config/OrderInfo.txt b/Config/OrderInfo.txt
index eded075..51b7fd0 100644
--- a/Config/OrderInfo.txt
+++ b/Config/OrderInfo.txt
@@ -10,6 +10,7 @@
7 cw.cz.6 btmdb 198 106 198 us.djyuan.099 us.djyuan.099 us.djyuan.099
8 cw.cz.7 btmdb 328 107 328 us.djyuan.099 us.djyuan.099 us.djyuan.099
9 cw.cz.8 btmdb 648 108 648 us.djyuan.099 us.djyuan.099 us.djyuan.099
+20 cw.tj.30d btmdb 18 1 18 us.djyuan.099 us.djyuan.099 us.djyuan.099
1000 cw.sc.1 test 6 100 6 us.djyuan.099 us.djyuan.099 us.djyuan.099
1001 test.cz.1 test 6 101 6 us.djyuan.099 us.djyuan.099 us.djyuan.099
1002 test.cz.2 test 30 102 30 us.djyuan.099 us.djyuan.099 us.djyuan.099
@@ -19,5 +20,4 @@
1006 test.cz.6 test 198 106 198 us.djyuan.099 us.djyuan.099 us.djyuan.099
1007 test.cz.7 test 328 107 328 us.djyuan.099 us.djyuan.099 us.djyuan.099
1008 test.cz.8 test 648 108 648 us.djyuan.099 us.djyuan.099 us.djyuan.099
-1009 test.taojinzd.week test 6 1 6 us.djyuan.099 us.djyuan.099 us.djyuan.099
-1010 test.taojinzd.month test 18 2 18 us.djyuan.099 us.djyuan.099 us.djyuan.099
+1020 test.tj.30d test 18 1 18 us.djyuan.099 us.djyuan.099 us.djyuan.099
diff --git a/Config/Skill.txt b/Config/Skill.txt
index 804eb9f..47eada6 100644
--- a/Config/Skill.txt
+++ b/Config/Skill.txt
@@ -284,8 +284,9 @@
20060101 20060101 1 1 鐢樻硥 娌荤枟鎴戞柟琛�閲忔渶浣庣殑鐩爣鏀诲嚮95%鐢熷懡鍊� 0 2 0 2 0 1 1 1 10000 0 4 200067
2006020 2006020 1 1 浜戞ⅵ娉借 涓�2鍚嶈閲忔渶浣庣殑鑻遍泟杩涜娌荤枟锛屾仮澶嶆敾鍑诲姏260%鐢熷懡鍊硷紝骞堕檮鍔犺拷鐚庡嵃璁帮紝鎻愬崌鍏惰繛鍑诲強杩藉嚮浼ゅ20%锛屽嵃璁版寔缁�2鍥炲悎 2 2 2 2 0 1 1 2 10000 0 0 angerSkill ganfuren2 2 25 26 60 4 230 [[10000]] 200063 200064 200062 200061
20060201 20060201 1 1 杩界寧鍗拌 杩界寧鍗拌锛屾彁鍗囧叾杩炲嚮鍙婅拷鍑讳激瀹�20%锛屽嵃璁版寔缁�2鍥炲悎 0 5 0 0 6 0 0 0 10000 0 4 200067
-2006030 2006030 1 1 榄傛ⅵ 鏅敾鏈�30%姒傜巼涓烘垜鏂硅嫳闆勫彔鍔犳祦姘村嵃璁帮紝姣忓眰鎻愬崌10%鏀诲嚮锛屾寔缁�2鍥炲悎锛屾渶澶�5灞� 3 0 4 [[10000]]
-2006050 2006050 1 1 瑙ｄ僵 鏅敾鏈�30%姒傜巼涓烘晫鏂规柦鍔犳槗浼ゅ嵃璁帮紝姣忓眰浣垮叾鍙楀埌鐨勪激瀹虫彁鍗�5%锛屾寔缁�2鍥炲悎锛屾渶澶�5灞� 3 0 4 [[10000]]
+2006030 2006030 1 1 榄傛ⅵ 鏅敾鏈�30%姒傜巼涓烘垜鏂硅嫳闆勫彔鍔犳祦姘村嵃璁帮紝姣忓眰鎻愬崌10%鏀诲嚮锛屾寔缁�2鍥炲悎锛屾渶澶�5灞� 3 7 0 0 0 0 0 0 10000 0 4
+20060301 20060301 1 1 娴佹按鍗拌 姣忓眰鎻愬崌10%鏀诲嚮锛屾寔缁�2鍥炲悎锛屾渶澶�5灞� 0 5 0 0 6 1 0 0 3000 0 4 200067
+2006050 2006050 1 1 瑙ｄ僵 鏅敾浼ゅ鍊嶇巼鎻愬崌30%锛屾不鐤楀�嶇巼鎻愬崌30% 3 7 0 0 0 0 0 0 10000 0 4
2006070 2006070 1 1 鍑屾尝 鍑绘檿鏁屾柟鐩爣鏃讹紝棰濆闄勫姞1灞傛槗浼ゅ嵃璁� 3 0 4 [[10000]]
2006080 2006080 1 1 鎬掓皵 鍒濆鑾峰緱50%鎬掓皵 3 1 0 6 5 1 0 0 10000 0 4 [[10000]]
2006090 2006090 1 1 鍗囧彉 娌荤枟鏁堟灉鎻愬崌10% 3 0 4 [[10000]]
diff --git a/UI/FullScreenBattleWin.prefab b/UI/FullScreenBattleWin.prefab
index 9f1a80c..e96a38e 100644
--- a/UI/FullScreenBattleWin.prefab
+++ b/UI/FullScreenBattleWin.prefab
@@ -874,9 +874,9 @@
m_Children: []
m_Father: {fileID: 6596073646348987259}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 667}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8717958305907642150
diff --git a/UI/HeroBestWin.prefab b/UI/HeroBestWin.prefab
index bdddde5..57f93b8 100644
--- a/UI/HeroBestWin.prefab
+++ b/UI/HeroBestWin.prefab
@@ -236,7 +236,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: -472.8345}
+ m_AnchoredPosition: {x: 350, y: -468.8345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3699978237004033381
@@ -621,7 +621,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 20
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -1376,7 +1376,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: -650.8345}
+ m_AnchoredPosition: {x: 350, y: -642.8345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4141181799006560916
@@ -3808,7 +3808,7 @@
m_GameObject: {fileID: 3499162179455780922}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalScale: {x: 0.74999994, y: 0.74999994, z: 0.74999994}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8358589126706920849}
@@ -3971,7 +3971,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: -574.3345}
+ m_AnchoredPosition: {x: 350, y: -566.3345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5353703778975737344
@@ -4646,7 +4646,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 20
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -4747,7 +4747,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 313.5, y: -124.5}
+ m_AnchoredPosition: {x: 311.5, y: -131.8}
m_SizeDelta: {x: 77, y: 247}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3883799934255524515
@@ -5306,7 +5306,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 20
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -7962,7 +7962,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 408.31, y: -45}
+ m_AnchoredPosition: {x: 408.31, y: -41}
m_SizeDelta: {x: 546.62, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5848388392292489353
diff --git a/UI/HeroCollectionWin.prefab b/UI/HeroCollectionWin.prefab
index 4b211d3..1d19d16 100644
--- a/UI/HeroCollectionWin.prefab
+++ b/UI/HeroCollectionWin.prefab
@@ -6924,7 +6924,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 70, y: 57.70996}
- m_SizeDelta: {x: 37, y: 38}
+ m_SizeDelta: {x: 53, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8337156339440132231
MonoBehaviour:
diff --git a/UI/HeroGiftWashWin.prefab b/UI/HeroGiftWashWin.prefab
index 8f54dba..8c9e39a 100644
--- a/UI/HeroGiftWashWin.prefab
+++ b/UI/HeroGiftWashWin.prefab
@@ -2340,7 +2340,6 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 8534221499677881682}
- {fileID: 6477437963991222046}
m_Father: {fileID: 5021955541792880788}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2996,6 +2995,7 @@
- component: {fileID: 6477437963991222046}
- component: {fileID: 7136835311980140012}
- component: {fileID: 3262872106976482596}
+ - component: {fileID: 8284375205227746502}
m_Layer: 5
m_Name: moneyvalue
m_TagString: Untagged
@@ -3014,13 +3014,14 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 8534221499677881682}
m_Father: {fileID: 5853139290720770211}
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: 49.22, y: -0.5}
- m_SizeDelta: {x: 135.4154, y: 32}
+ m_AnchoredPosition: {x: 20, y: -0.5}
+ m_SizeDelta: {x: 0, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7136835311980140012
CanvasRenderer:
@@ -3057,17 +3058,31 @@
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
- m_Alignment: 3
+ m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 150/50
m_IsKey: 0
m_KeyName:
m_ColorType: 0
m_BGColorType: 0
+--- !u!114 &8284375205227746502
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4199452448023668151}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 2
+ m_VerticalFit: 0
--- !u!1 &4288051457227906208
GameObject:
m_ObjectHideFlags: 0
@@ -3693,11 +3708,11 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 5853139290720770211}
+ m_Father: {fileID: 6477437963991222046}
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: -36.5, y: 0}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3433832871143109420
diff --git a/UI/HeroLVBreakSuccessWin.prefab b/UI/HeroLVBreakSuccessWin.prefab
index 184f809..9b5401f 100644
--- a/UI/HeroLVBreakSuccessWin.prefab
+++ b/UI/HeroLVBreakSuccessWin.prefab
@@ -152,6 +152,7 @@
- {fileID: 4393457727514407157}
potentialText: {fileID: 5267720577832088037}
okBtn: {fileID: 4797996715329147811}
+ scrollRect: {fileID: 8329755060919050815}
--- !u!1 &213861980230965415
GameObject:
m_ObjectHideFlags: 0
@@ -604,6 +605,7 @@
- component: {fileID: 6355725669742516128}
- component: {fileID: 7667604537605330253}
- component: {fileID: 5267720577832088037}
+ - component: {fileID: 3776569286802426665}
m_Layer: 5
m_Name: herolvbreak_txt_4
m_TagString: Untagged
@@ -623,12 +625,12 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 3228390938762868906}
+ m_Father: {fileID: 8878596094887708906}
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: -230.5}
- m_SizeDelta: {x: 623, y: 84.87}
+ m_AnchoredPosition: {x: 0, y: 0.00012207031}
+ m_SizeDelta: {x: 623, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7667604537605330253
CanvasRenderer:
@@ -652,7 +654,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.16470589, g: 0.8901961, b: 0.21568628, a: 1}
- m_RaycastTarget: 0
+ m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -669,13 +671,27 @@
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6F5C\u80FD\u6FC0\u6D3B\uFF1A\u521D\u59CB\u6012\u6C14+500\uFF0C\u6B66\u5C06\u653B\u51FB+5%"
m_IsKey: 0
m_KeyName:
m_ColorType: 0
m_BGColorType: 0
+--- !u!114 &3776569286802426665
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2714454260719004305}
+ 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 &2787550123483441374
GameObject:
m_ObjectHideFlags: 0
@@ -1254,6 +1270,88 @@
m_PixelsPerUnitMultiplier: 1
m_Gray: 0
m_IconKey:
+--- !u!1 &4281074359650641401
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8878596094887708906}
+ - component: {fileID: 8329755060919050815}
+ - component: {fileID: 1406174088244401632}
+ m_Layer: 5
+ m_Name: scrollrect
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8878596094887708906
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4281074359650641401}
+ 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: 6355725669742516128}
+ m_Father: {fileID: 3228390938762868906}
+ 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: -233.8}
+ m_SizeDelta: {x: 660.96, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8329755060919050815
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4281074359650641401}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 6355725669742516128}
+ 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: 0}
+ 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 &1406174088244401632
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4281074359650641401}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
--- !u!1 &4339041253782781246
GameObject:
m_ObjectHideFlags: 0
@@ -2225,7 +2323,7 @@
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: -325.9}
+ m_AnchoredPosition: {x: 0, y: -337.94}
m_SizeDelta: {x: 163, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4797996715329147811
@@ -2783,7 +2881,7 @@
- {fileID: 6335957979593876425}
- {fileID: 8816844602991659196}
- {fileID: 7389637829099229968}
- - {fileID: 6355725669742516128}
+ - {fileID: 8878596094887708906}
- {fileID: 2531678291394835241}
- {fileID: 2662776357136614420}
- {fileID: 1483438446020250528}
diff --git a/UI/HeroLVBreakWin.prefab b/UI/HeroLVBreakWin.prefab
index 0e1bd8f..5f038b6 100644
--- a/UI/HeroLVBreakWin.prefab
+++ b/UI/HeroLVBreakWin.prefab
@@ -154,6 +154,7 @@
moneyIcon: {fileID: 4795293734977448786}
moneyText: {fileID: 330061820742220225}
breakBtn: {fileID: 8838780961839766572}
+ scrollRect: {fileID: 4924066992732712388}
--- !u!1 &15148971624796552
GameObject:
m_ObjectHideFlags: 0
@@ -1139,6 +1140,7 @@
- component: {fileID: 9130252076543353894}
- component: {fileID: 292301650639018025}
- component: {fileID: 330061820742220225}
+ - component: {fileID: 3859682051333331682}
m_Layer: 5
m_Name: value
m_TagString: Untagged
@@ -1157,13 +1159,14 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1223136439127540797}
+ m_Children:
+ - {fileID: 1223136439127540797}
+ m_Father: {fileID: 2223191653703231603}
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: 106.2, y: -2}
- m_SizeDelta: {x: 177.0892, y: 35}
+ m_AnchoredPosition: {x: 8.5, y: 12.200012}
+ m_SizeDelta: {x: 0, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &292301650639018025
CanvasRenderer:
@@ -1200,17 +1203,31 @@
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
- m_Alignment: 3
+ m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1234567/50
m_IsKey: 0
m_KeyName:
m_ColorType: 0
m_BGColorType: 0
+--- !u!114 &3859682051333331682
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3697571527913877565}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 2
+ m_VerticalFit: 0
--- !u!1 &3780486622822369525
GameObject:
m_ObjectHideFlags: 0
@@ -1982,13 +1999,13 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1223136439127540797}
+ - {fileID: 9130252076543353894}
- {fileID: 5578480241905999772}
m_Father: {fileID: 5459849411029998266}
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: -8, y: -163.5}
+ m_AnchoredPosition: {x: -8, y: -177.4}
m_SizeDelta: {x: 123, y: 81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5232574143831463570
@@ -2029,7 +2046,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -5.5, y: -223}
- m_SizeDelta: {x: 735, y: 549}
+ m_SizeDelta: {x: 735, y: 566.66}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4150587417020844964
CanvasRenderer:
@@ -2071,6 +2088,97 @@
m_PixelsPerUnitMultiplier: 1
m_Gray: 0
m_IconKey:
+--- !u!1 &5358304622498829716
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 478497502606446443}
+ - component: {fileID: 3034154615440623534}
+ - component: {fileID: 1692839984561854188}
+ - component: {fileID: 4924066992732712388}
+ m_Layer: 5
+ m_Name: scrollrect
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &478497502606446443
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5358304622498829716}
+ 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: 8810906001969318477}
+ m_Father: {fileID: 5007849189937181600}
+ 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: -1.5, y: -171.60048}
+ m_SizeDelta: {x: 650, y: 104.731}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3034154615440623534
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5358304622498829716}
+ m_CullTransparentMesh: 1
+--- !u!114 &1692839984561854188
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5358304622498829716}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
+--- !u!114 &4924066992732712388
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5358304622498829716}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 8810906001969318477}
+ 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: 0}
+ 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!1 &5509485635160076047
GameObject:
m_ObjectHideFlags: 0
@@ -2490,7 +2598,7 @@
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: 2.5, y: 271.5}
+ m_AnchoredPosition: {x: 2.5, y: 281.1}
m_SizeDelta: {x: 418, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5653289299927311180
@@ -2645,7 +2753,7 @@
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: 5, y: 255.5}
+ m_AnchoredPosition: {x: 5, y: 271.6}
m_SizeDelta: {x: 622, y: 221}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8795721176159216784
@@ -2782,6 +2890,7 @@
- component: {fileID: 8810906001969318477}
- component: {fileID: 1376552894444186277}
- component: {fileID: 801499075929109283}
+ - component: {fileID: 3922893583824801466}
m_Layer: 5
m_Name: herolvbreak_txt_54
m_TagString: Untagged
@@ -2801,12 +2910,12 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 5007849189937181600}
+ m_Father: {fileID: 478497502606446443}
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: -1.5, y: -154.8}
- m_SizeDelta: {x: 650, y: 71.13}
+ m_AnchoredPosition: {x: 0, y: -0.00041377172}
+ m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1376552894444186277
CanvasRenderer:
@@ -2830,7 +2939,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.14117648, g: 0.54509807, b: 0.07058824, a: 1}
- m_RaycastTarget: 0
+ m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2847,13 +2956,27 @@
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 1
+ m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6F5C\u80FD\u6FC0\u6D3B\uFF1A\u521D\u59CB\u6012\u6C14+500\u6B66\u5C06\u653B\u51FB+5%"
m_IsKey: 0
m_KeyName:
m_ColorType: 0
m_BGColorType: 0
+--- !u!114 &3922893583824801466
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7556176529408094358}
+ 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 &8074174406564973072
GameObject:
m_ObjectHideFlags: 0
@@ -2966,13 +3089,12 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 9130252076543353894}
- m_Father: {fileID: 2223191653703231603}
+ m_Children: []
+ m_Father: {fileID: 9130252076543353894}
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: -51.5, y: 13.7}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: -16, y: 1.4999876}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2370468930179774438
@@ -3324,12 +3446,12 @@
m_Children:
- {fileID: 1896743316989598852}
- {fileID: 4010554648643462124}
- - {fileID: 8810906001969318477}
+ - {fileID: 478497502606446443}
m_Father: {fileID: 5459849411029998266}
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: 66.5}
+ m_AnchoredPosition: {x: 0, y: 91.21}
m_SizeDelta: {x: 711, y: 232}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5694589770893715827
diff --git a/UI/HeroListWin.prefab b/UI/HeroListWin.prefab
index 1c477c6..cd10e7a 100644
--- a/UI/HeroListWin.prefab
+++ b/UI/HeroListWin.prefab
@@ -7029,7 +7029,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 70, y: 57.71}
- m_SizeDelta: {x: 37, y: 38}
+ m_SizeDelta: {x: 53, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6117277748506401386
MonoBehaviour:
diff --git a/UI/HeroTrainWin.prefab b/UI/HeroTrainWin.prefab
index 8f7db72..18054c5 100644
--- a/UI/HeroTrainWin.prefab
+++ b/UI/HeroTrainWin.prefab
@@ -272,7 +272,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: -472.8345}
+ m_AnchoredPosition: {x: 350, y: -468.8345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3699978237004033381
@@ -832,7 +832,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 22
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -1768,7 +1768,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: -650.8345}
+ m_AnchoredPosition: {x: 350, y: -642.8345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4141181799006560916
@@ -4932,7 +4932,7 @@
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: -2, y: -27.5}
+ m_AnchoredPosition: {x: 0, y: -27.5}
m_SizeDelta: {x: 46, y: 27}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4908329442914300931
@@ -4965,10 +4965,10 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 19
+ m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
- m_MinSize: 10
+ m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@@ -5105,7 +5105,7 @@
m_GameObject: {fileID: 3499162179455780922}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8358589126706920849}
@@ -5268,7 +5268,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: -574.3345}
+ m_AnchoredPosition: {x: 350, y: -566.3345}
m_SizeDelta: {x: 700, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5353703778975737344
@@ -6468,7 +6468,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 20
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -6721,7 +6721,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 313.5, y: -124.5}
+ m_AnchoredPosition: {x: 311.5, y: -131.8}
m_SizeDelta: {x: 77, y: 247}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3883799934255524515
@@ -7402,7 +7402,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
- m_FontSize: 22
+ m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@@ -11897,7 +11897,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 408.31, y: -45}
+ m_AnchoredPosition: {x: 408.31, y: -41}
m_SizeDelta: {x: 546.62, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5848388392292489353
--
Gitblit v1.8.0