From 650efac1f6e609411bd66f8fbe7ad3286b19158f Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 08 八月 2025 10:48:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Texture.meta | 2
UI/HomeWin.prefab | 4
Texture/FullScreenBg/herocardbg.jpg | 0
Texture/FullScreenBg/mainui_img_277.png.meta | 4
Config/DamageNum.txt.meta | 7 +
Texture/FullScreenBg/battlebg1.jpg | 0
Config/DamageNum.txt | 13 +++
Config/FuncConfig.txt | 2
Battle/Prefabs/BattleRootNode.prefab | 118 ++++++++++++++++++++++-------
Texture/FullScreenBg/mainui_img_277.png | 0
Texture/FullScreenBg/battlebg1.jpg.meta | 4
Config/Skill.txt | 29 +++++--
Texture/FullScreenBg.meta | 2
Texture/FullScreenBg/herocardbg.jpg.meta | 4
14 files changed, 143 insertions(+), 46 deletions(-)
diff --git a/Battle/Prefabs/BattleRootNode.prefab b/Battle/Prefabs/BattleRootNode.prefab
index ac27ec8..0b1e901 100644
--- a/Battle/Prefabs/BattleRootNode.prefab
+++ b/Battle/Prefabs/BattleRootNode.prefab
@@ -35,6 +35,83 @@
m_AnchoredPosition: {x: -130, y: -140}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &640602583834906894
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8462860327682839589}
+ - component: {fileID: 2934426881868246155}
+ - component: {fileID: 5548338120051221657}
+ m_Layer: 5
+ m_Name: DropNode
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8462860327682839589
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 640602583834906894}
+ 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: 1797432506885981723}
+ 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!114 &2934426881868246155
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 640602583834906894}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 0
+--- !u!114 &5548338120051221657
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 640602583834906894}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!1 &1444965143491619260
GameObject:
m_ObjectHideFlags: 0
@@ -226,24 +303,8 @@
m_Script: {fileID: 11500000, guid: 7ff74171c89d45d46995ac2dd01acd80, type: 3}
m_Name:
m_EditorClassIdentifier:
- redTeamNode: {fileID: 7065582698912777848}
- redTeamNodeList:
- - {fileID: 7628891344751719836}
- - {fileID: 1742688219717404095}
- - {fileID: 8246063382885510010}
- - {fileID: 6402589134242387071}
- - {fileID: 2117733420619445356}
- - {fileID: 5313075342732907856}
- - {fileID: 7448047187578396776}
- blueTeamNode: {fileID: 5521273624278094336}
- blueTeamNodeList:
- - {fileID: 8357499947697178639}
- - {fileID: 3284513153888160898}
- - {fileID: 5147734283714795390}
- - {fileID: 1444965143491619260}
- - {fileID: 7886115065398075781}
- - {fileID: 476339351683801538}
- - {fileID: 2674298843862673639}
+ redTeamNode: {fileID: 5521273624278094336}
+ blueTeamNode: {fileID: 7065582698912777848}
imgBackground: {fileID: 3630042615940608664}
--- !u!1 &3284513153888160898
GameObject:
@@ -312,11 +373,11 @@
m_Children: []
m_Father: {fileID: 2610348819904339951}
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}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: -335}
+ m_SizeDelta: {x: 750, y: 1334}
+ m_Pivot: {x: 0.5, y: 0}
--- !u!222 &4629097904417186064
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -432,7 +493,7 @@
m_Component:
- component: {fileID: 5521273624278094336}
m_Layer: 5
- m_Name: BlueTeam
+ m_Name: RedTeam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -461,7 +522,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: -120, y: 150}
+ m_AnchoredPosition: {x: -120, y: 220}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6333665137478379820
@@ -474,7 +535,7 @@
m_Component:
- component: {fileID: 7065582698912777848}
m_Layer: 5
- m_Name: RedTeam
+ m_Name: BlueTeam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -503,7 +564,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: 120, y: 150}
+ m_AnchoredPosition: {x: 120, y: 220}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6402589134242387071
@@ -708,7 +769,8 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children: []
+ m_Children:
+ - {fileID: 8462860327682839589}
m_Father: {fileID: 5521273624278094336}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
diff --git a/Config/DamageNum.txt b/Config/DamageNum.txt
new file mode 100644
index 0000000..99a15fa
--- /dev/null
+++ b/Config/DamageNum.txt
@@ -0,0 +1,13 @@
+string int int int int[]
+id prefix plus minus nums
+椋樿绫诲瀷 鍓嶇紑 鍔犲彿 鍑忓彿 鏁板瓧
+Damage 45 48|49|50|51|52|53|54|55|56|57|46|107|109|98|116
+Recovery 295 280|281|282|283|284|285|286|287|288|289|290|291|292|293|294
+Reflect 257 256 240|241|242|243|244|245|246|247|248|249|250|251|252|253|254
+Bloody 236 220|221|222|223|224|225|226|227|228|229|230|231|232|233|234
+Block 277 276 260|261|262|263|264|265|266|267|268|269|270|271|272|273|274
+Critical 217 216 200|201|202|203|204|205|206|207|208|209|210|211|212|213|214
+Dodge 303
+Combo 302
+CounterAttack 300
+RageUp 337 335 320|321|322|323|324|325|326|327|328|329|330|331|332|333|334
diff --git a/Config/DamageNum.txt.meta b/Config/DamageNum.txt.meta
new file mode 100644
index 0000000..b2cbe79
--- /dev/null
+++ b/Config/DamageNum.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 838fb8b4f09755d43abde50703268807
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt
index f59f72e..57ba980 100644
--- a/Config/FuncConfig.txt
+++ b/Config/FuncConfig.txt
@@ -15,6 +15,7 @@
TreasureSet {0:10,1:10} {2330:[4318,4313,4323,4328,4358,4393,4383,4433,4348,4438,4388,4443,4363,4428,4343,4353],2331:[4319,4314,4324,4329,4359,4394,4384,4434,4349,4439,4389,4444,4364,4429,4344,4354],2332:[4320,4315,4325,4330,4360,4395,4385,4435,4350,4440,4390,4445,4365,4430,4345,4355],2214:[4183,4185,195,199]} 200
HeroStarTalent 4 10 3 5
HeroWash 181|20 182|20
+HeroRebirth 1 2
HeroAttrFormula (lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue (lvValue+equipValue+bookValue)*inheritPer+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue Atk*10+Def+MaxHP+StunRate+StunRateDef+SuperHitRate+SuperHitRateDef+ComboRate+ComboRateDef+MissRate+MissRateDef+ParryRate+ParryRateDef+SuckHPPer+SuckHPPerDef+FinalDamPer+FinalDamPerDef+PhyDamPer+PhyDamPerDef+MagDamPer+MagDamPerDef+NormalSkillPer+NormalSkillPerDef+AngerSkillPer+AngerSkillPerDef+SuperDamPer+SuperDamPerDef+CurePer+CurePerDef+ShieldPer+ShieldPerDef+DOTPer+DOTPerDef
FuncLevelLimitClient {"1":30}
DownReward [(20,500,1),(2,1,1),(911,1,1)] 20 [[150,50,0],[181,10,0],[4151,10,0],[3,1,0]] 1 1
@@ -36,3 +37,4 @@
CycleHall {"1":240, "2":74, "10":498, "11":240, "12":33,"13":272} {"1":8, "2":113, "10":234, "11":8, "12":6,"13":155}
YunShi {"0":[[1, 2]],"105":[[1, 1],[2, 1]], "106":[[1, 1],[2, 1]], "107":[[1, 1],[2, 1]], "108":[[1, 1],[2, 1]]} {"105":6, "106":214, "107":8, "108":155}
MoneyDisplayModel {"1":1,"41":3} 0 0
+BattleModelScale 0.8
diff --git a/Config/Skill.txt b/Config/Skill.txt
index e5f44e3..3d91a81 100644
--- a/Config/Skill.txt
+++ b/Config/Skill.txt
@@ -1,8 +1,21 @@
-int string string string int int int int int int int int int[] int int[] int int[] int int[] int int int int int int int float int[][] int int int int int int string int int int
-SkillID SkillName Description IconName FuncType SkillType HurtType AtkType TagAim LastTime CoolDownTime EffectID1 EffectValues1 EffectID2 EffectValues2 EffectID3 EffectValues3 ConnSkill EnhanceSkillList FightPower StartupFrames ActiveFrames RecoveryFrames LoopCount CastPosition CastIndexNum CastDistance DamageDivide BulletEffectId BulletPos BulletPath BulletFlyTime ExplosionEffectId ExplosionPos SkillMotionName EffectId EffectPos EffectType
-鎶�鑳絀D 鎶�鑳藉悕绉� 鎶�鑳芥弿杩� 鎶�鑳藉浘鏍� 鎸夊姛鑳藉垎绫� 鎶�鑳界被鍨� 浼ゅ绫诲瀷 閲婃斁鏂瑰紡 鐬勫噯浣嶇疆 鎸佺画鏃堕棿 鍐峰嵈鏃堕棿 鏁堟灉ID1 鏁堟灉鍊煎垪琛�1 鏁堟灉ID2 鏁堟灉鍊煎垪琛�2 鏁堟灉ID3 鏁堟灉鍊煎垪琛�3 鍏宠仈鎶�鑳� 瑙﹀彂鎶�鑳絀D鍒楄〃 鎶�鑳芥垬鍔� 鍓嶆憞甯ф暟 涓憞甯ф暟 鍚庢憞甯ф暟 涓憞閲嶅娆℃暟 鏂芥硶浣嶇疆 CastPosition鏁屾垜鐨勬墿灞� 鏂芥硶璺濈 浼ゅ鍒嗗竷 瀛愬脊鐗规晥id 瀛愬脊缁戠偣 瀛愬脊杞ㄨ抗 瀛愬脊椋炶鏃堕棿 鐖嗙偢鐗规晥id 鐖嗙偢缁戠偣 鎶�鑳藉姩浣滃悕 鏂芥硶鐗规晥 鏂芥硶鐗规晥缁戠偣 鏂芥硶鐗规晥鐨勭被鍨�
-100 閫氱敤鍙嶅嚮 閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ 4 1 1 1 0 0 0 1010 10000 0 0 0 0
-100101 鏇瑰┐鏅妧 瀵硅閲忔渶浣庣殑鐩爣閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ 1 1 1 1 0 0 0 1010 10000 0 0 0 0
-100102 鏇瑰┐鎬掓妧 瀵圭旱鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�210%鐨勭墿鐞嗕激瀹� 2 1 1 1 5 0 0 1010 21000 0 0 0 0
-200101 绯滅鏅妧 瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�105%鐨勭墿鐞嗕激瀹� 1 1 1 1 1 0 0 1010 10500 0 0 0 0
-200102 绯滅鎬掓妧 娌荤枟琛�閲忔渶浣�2涓洰鏍囨敾鍑诲姏210%鐢熷懡鍊� 2 2 1 2 0 0 0 1000 21000|1 0 0 0 0
+int int int string string int int int int int int int int int int int int int int[] int int[] int int[] int int[] int int int int int int int float int[][] int int int int int int string int int int string
+SkillID SkillTypeID SkillMaxLV SkillName Description FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount HappenRate LastTime CoolDownTime Priority EffectID1 EffectValues1 EffectID2 EffectValues2 EffectID3 EffectValues3 ConnSkill EnhanceSkillList FightPower StartupFrames ActiveFrames RecoveryFrames LoopCount CastPosition CastIndexNum CastDistance DamageDivide BulletEffectId BulletPos BulletPath BulletFlyTime ExplosionEffectId ExplosionPos SkillMotionName EffectId EffectPos EffectType IconName
+鎶�鑳絀D 鎶�鑳絋ypeID 鏈�楂樼瓑绾� 鎶�鑳藉悕绉� 鎶�鑳芥弿杩� 鎸夊姛鑳藉垎绫� 鎶�鑳界被鍨� 浼ゅ绫诲瀷 閲婃斁鏂瑰紡 鐩爣鑼冨洿 鐩爣鍙嬪ソ 鐩爣缁嗗垎 鐩爣涓暟 姒傜巼 鎸佺画鏃堕棿 鍐峰嵈鏃堕棿 浼樺厛绾� 鏁堟灉ID1 鏁堟灉鍊煎垪琛�1 鏁堟灉ID2 鏁堟灉鍊煎垪琛�2 鏁堟灉ID3 鏁堟灉鍊煎垪琛�3 鍏宠仈鎶�鑳� 棰濆鎶�鑳絀D鍒楄〃 鎶�鑳芥垬鍔� 鍓嶆憞甯ф暟 涓憞甯ф暟 鍚庢憞甯ф暟 涓憞閲嶅娆℃暟 鏂芥硶浣嶇疆 CastPosition鏁屾垜鐨勬墿灞� 鏂芥硶璺濈 浼ゅ鍒嗗竷 瀛愬脊鐗规晥id 瀛愬脊缁戠偣 瀛愬脊杞ㄨ抗 瀛愬脊椋炶鏃堕棿 鐖嗙偢鐗规晥id 鐖嗙偢缁戠偣 鎶�鑳藉姩浣滃悕 鏂芥硶鐗规晥 鏂芥硶鐗规晥缁戠偣 鏂芥硶鐗规晥鐨勭被鍨� 鎶�鑳藉浘鏍�
+100 100 1 閫氱敤鍙嶅嚮 閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ 4 1 1 1 0 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+200 200 1 鐪╂檿 閫氱敤鐪╂檿1鍥炲悎 0 14 0 0 6 0 0 0 10000 1 0 0 4012 7
+100101 100101 1 鏇瑰┐鏅妧 瀵硅閲忔渶浣庣殑鐩爣閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ 1 1 1 1 0 0 1 1 10000 0 0 0 1010 10000 0 0 0 0
+100102 100102 1 鏇瑰┐鎬掓妧 瀵圭旱鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�210%鐨勭墿鐞嗕激瀹� 2 1 1 1 4 0 0 2 10000 0 0 0 1010 21000 0 0 0 0
+100301 100301 1 搴炲痉鏅妧 瀵瑰崟浣撶洰鏍囬�犳垚105%鐗╃悊浼ゅ 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+100302 100302 1 搴炲痉鎬掓妧 瀵瑰墠鎺�3涓洰鏍囬�犳垚鏀诲嚮鍔�150%鐗╃悊浼ゅ锛�50%姒傜巼闄勫姞鍗哥敳锛岄檷浣庣洰鏍�50%闃插尽锛屾寔缁�2鍥炲悎 2 1 1 1 2 0 0 3 10000 0 0 0 1010 15000 0 0 0 1003021 0
+1003021 1003021 1 鍗哥敳 闄嶄綆闃插尽50%锛屾寔缁�2鍥炲悎 0 6 0 0 6 0 0 0 5000 2 0 0 17 5000|2 0 0 0
+200101 200101 1 绯滅鏅妧 瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�105%鐨勭墿鐞嗕激瀹� 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+200102 200102 1 绯滅鎬掓妧 娌荤枟琛�閲忔渶浣�2涓洰鏍囨敾鍑诲姏210%鐢熷懡鍊� 2 2 1 2 0 1 1 2 10000 0 0 0 1000 21000|0 0 0 0 0
+300101 300101 1 娼樼拫鏅妧 瀵圭洰鏍囬�犳垚70%浼ゅ锛�50%姒傜巼闄勫甫鐏肩儳锛屾瘡鍥炲悎閫犳垚鏀诲嚮鍔�75%浼ゅ锛屾寔缁�2鍥炲悎 1 1 1 1 1 0 0 1 10000 0 0 0 1010 7000 0 0 0 3001011 0
+3001011 3001011 1 鐏肩儳 姣忓洖鍚堥�犳垚鏀诲嚮鍔�75%鐏肩儳浼ゅ锛屾寔缁�2鍥炲悎 0 4 1 0 6 0 0 0 10000 2 0 0 1034 7500 5001 0 4012 13 0 0
+300102 300102 1 娼樼拫鎬掓妧 瀵圭洰鏍囬�犳垚浼�300%浼ゅ锛岄澶栬幏寰�10鐐规�掓皵 2 1 1 1 1 0 0 1 10000 0 0 0 1010 30000 0 0 0 3001021 0
+3001021 3001021 1 棰濆鎬掓皵 棰濆鑾峰緱10鐐规�掓皵 0 0 0 6 5 0 0 0 10000 0 0 0 1001 0|10|1 0 0 0 0
+400101 400101 1 绾伒鏅妧 瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�120%鐗╃悊浼ゅ锛屾櫘鏀诲嚮鏅曟鐜囨彁鍗�10% 1 1 1 1 1 0 0 1 10000 0 0 0 1010 12000 0 0 0 0
+400102 400102 1 绾伒鎬掓妧 瀵瑰墠鎺掔洰鏍囬�犳垚鏀诲嚮鍔�130%鐗╃悊浼ゅ锛�20%姒傜巼閫犳垚鍑绘檿 2 1 1 1 2 0 0 0 10000 0 0 0 1010 13000 0 0 0 4001021 0
+4001021 4001021 1 棰濆鍑绘檿 20%姒傜巼閫犳垚鍑绘檿 0 14 0 0 6 0 0 0 2000 1 0 0 4012 7 0 0 0
+400201 400201 1 閮睖鏅妧 瀵瑰悗鎺掗殢鏈虹洰鏍囬�犳垚鏀诲嚮鍔�100%娉曟湳浼ゅ 1 1 2 1 3 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+400202 400202 1 閮睖鎬掓妧 瀵瑰悗鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�220%娉曟湳浼ゅ 2 1 2 1 3 0 0 2 10000 0 0 0 1010 22000 0 0 0 0
diff --git a/Sprite/5SkinBG.meta b/Texture.meta
similarity index 76%
copy from Sprite/5SkinBG.meta
copy to Texture.meta
index c4ac935..801cafa 100644
--- a/Sprite/5SkinBG.meta
+++ b/Texture.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8cbbf45b8be8a5447bf9c3e171545500
+guid: cc4265f3ee528e64e8afa76bd8f7d3f7
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Sprite/5SkinBG.meta b/Texture/FullScreenBg.meta
similarity index 76%
rename from Sprite/5SkinBG.meta
rename to Texture/FullScreenBg.meta
index c4ac935..1cf9d8c 100644
--- a/Sprite/5SkinBG.meta
+++ b/Texture/FullScreenBg.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8cbbf45b8be8a5447bf9c3e171545500
+guid: fb1e75e82e6f1c74495dac78e0d11475
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Sprite/5SkinBG/battlebg1.jpg b/Texture/FullScreenBg/battlebg1.jpg
similarity index 100%
rename from Sprite/5SkinBG/battlebg1.jpg
rename to Texture/FullScreenBg/battlebg1.jpg
Binary files differ
diff --git a/Sprite/5SkinBG/battlebg1.jpg.meta b/Texture/FullScreenBg/battlebg1.jpg.meta
similarity index 98%
rename from Sprite/5SkinBG/battlebg1.jpg.meta
rename to Texture/FullScreenBg/battlebg1.jpg.meta
index 95d221d..f994a58 100644
--- a/Sprite/5SkinBG/battlebg1.jpg.meta
+++ b/Texture/FullScreenBg/battlebg1.jpg.meta
@@ -6,7 +6,7 @@
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -40,7 +40,7 @@
wrapU: 1
wrapV: 1
wrapW: 1
- nPOTScale: 3
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
diff --git a/Sprite/5SkinBG/herocardbg.jpg b/Texture/FullScreenBg/herocardbg.jpg
similarity index 100%
rename from Sprite/5SkinBG/herocardbg.jpg
rename to Texture/FullScreenBg/herocardbg.jpg
Binary files differ
diff --git a/Sprite/5SkinBG/herocardbg.jpg.meta b/Texture/FullScreenBg/herocardbg.jpg.meta
similarity index 98%
rename from Sprite/5SkinBG/herocardbg.jpg.meta
rename to Texture/FullScreenBg/herocardbg.jpg.meta
index 0d21468..4b97ba1 100644
--- a/Sprite/5SkinBG/herocardbg.jpg.meta
+++ b/Texture/FullScreenBg/herocardbg.jpg.meta
@@ -6,7 +6,7 @@
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -40,7 +40,7 @@
wrapU: 1
wrapV: 1
wrapW: 1
- nPOTScale: 3
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
diff --git a/Sprite/5SkinBG/mainui_img_277.png b/Texture/FullScreenBg/mainui_img_277.png
similarity index 100%
rename from Sprite/5SkinBG/mainui_img_277.png
rename to Texture/FullScreenBg/mainui_img_277.png
Binary files differ
diff --git a/Sprite/5SkinBG/mainui_img_277.png.meta b/Texture/FullScreenBg/mainui_img_277.png.meta
similarity index 98%
rename from Sprite/5SkinBG/mainui_img_277.png.meta
rename to Texture/FullScreenBg/mainui_img_277.png.meta
index 71a4f86..c25ce1c 100644
--- a/Sprite/5SkinBG/mainui_img_277.png.meta
+++ b/Texture/FullScreenBg/mainui_img_277.png.meta
@@ -6,7 +6,7 @@
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -40,7 +40,7 @@
wrapU: 1
wrapV: 1
wrapW: 1
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
diff --git a/UI/HomeWin.prefab b/UI/HomeWin.prefab
index 944ce43..f68ad71 100644
--- a/UI/HomeWin.prefab
+++ b/UI/HomeWin.prefab
@@ -19909,7 +19909,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &3704827360736816936
RectTransform:
m_ObjectHideFlags: 0
@@ -19958,7 +19958,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Texture: {fileID: 2800000, guid: ffc11993ebd5fdf489f685b4c08f86e1, type: 3}
+ m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
--
Gitblit v1.8.0