diff --git a/Assets/_Zombie/Prefabs/Bullets/BeamBullet.prefab b/Assets/_Zombie/Prefabs/Bullets/BeamBullet.prefab index ded2554a..a974ccd6 100644 --- a/Assets/_Zombie/Prefabs/Bullets/BeamBullet.prefab +++ b/Assets/_Zombie/Prefabs/Bullets/BeamBullet.prefab @@ -235,7 +235,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4530503792941441718, guid: 9d4f79ec3268a0e4f97e447680f47a08, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/_Zombie/Prefabs/Guns/BeamGun.prefab b/Assets/_Zombie/Prefabs/Guns/BeamGun.prefab index 3cb7996d..1fa4a6bf 100644 --- a/Assets/_Zombie/Prefabs/Guns/BeamGun.prefab +++ b/Assets/_Zombie/Prefabs/Guns/BeamGun.prefab @@ -193,17 +193,17 @@ PrefabInstance: - target: {fileID: 4926566088772212268, guid: 53868cbf00755774ab00f4f70c9462c1, type: 3} propertyPath: m_LocalScale.x - value: -13.59 + value: -25.11 objectReference: {fileID: 0} - target: {fileID: 4926566088772212268, guid: 53868cbf00755774ab00f4f70c9462c1, type: 3} propertyPath: m_LocalScale.y - value: -13.59 + value: -25.11 objectReference: {fileID: 0} - target: {fileID: 4926566088772212268, guid: 53868cbf00755774ab00f4f70c9462c1, type: 3} propertyPath: m_LocalScale.z - value: -13.59 + value: -25.11 objectReference: {fileID: 0} - target: {fileID: 4926566088772212268, guid: 53868cbf00755774ab00f4f70c9462c1, type: 3} diff --git a/Assets/_Zombie/Prefabs/Guns/Gun2.prefab b/Assets/_Zombie/Prefabs/Guns/Gun2.prefab index 913205f8..0ddc09bd 100644 --- a/Assets/_Zombie/Prefabs/Guns/Gun2.prefab +++ b/Assets/_Zombie/Prefabs/Guns/Gun2.prefab @@ -48641,7 +48641,7 @@ MonoBehaviour: shot: {fileID: 3304956280911381197} flameRange: 5 flameAngle: 45 - shotSource: {fileID: 0} + shotSource: {fileID: 3734899580846833196} --- !u!82 &3734899580846833196 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Prefabs/Guns/Gun3.prefab b/Assets/_Zombie/Prefabs/Guns/Gun3.prefab index 3cc61f5c..06672674 100644 --- a/Assets/_Zombie/Prefabs/Guns/Gun3.prefab +++ b/Assets/_Zombie/Prefabs/Guns/Gun3.prefab @@ -149,7 +149,6 @@ Transform: m_Children: - {fileID: 4480223987781916997} - {fileID: 2346333316375404872} - - {fileID: 8109880418380228148} - {fileID: 2942540676804005468} - {fileID: 2670935677523557990} m_Father: {fileID: 0} @@ -451,85 +450,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6599755212931468579} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6948044951173236976 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1228691179114836659} - m_Modifications: - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.0211 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.1105 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6557808795262365063, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_Name - value: "\u521D\u59CB\u67AA" - objectReference: {fileID: 0} - - target: {fileID: 6557808795262365063, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, type: 3} ---- !u!4 &8109880418380228148 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1216111914691833540, guid: 0cf0eff4c8c1c724faa95eda1fac3f2b, - type: 3} - m_PrefabInstance: {fileID: 6948044951173236976} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8648004169534469699 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Resources/Data.json b/Assets/_Zombie/Resources/Data.json index 255728ea..7db65fb9 100644 --- a/Assets/_Zombie/Resources/Data.json +++ b/Assets/_Zombie/Resources/Data.json @@ -1 +1 @@ -{"EnemysInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","Atk","SpecialAtk1","SpecialAtk2","AtkArea","Speed","Frequency","Score","Weight"],"Values":[[ 0, 0,"ThinZombie","\u7626\u5B50\u50F5\u5C38", 1, 10, 1,-1,-1,"[2,4]", 1, 1, 2, 2],[ 1, 1,"FatZombie","\u80D6\u5B50\u50F5\u5C38", 2, 30, 4,-1,-1,"[3,6]",0.5,0.5, 6, 6],[ 2, 2,"ExplosionDog","\u81EA\u7206\u72D7", 1, 5, 1, 1,-1,"[3,5]", 2, 1.5, 1, 1],[ 3, 3,"RunZombie","\u8DD1\u6B65\u50F5\u5C38", 2, 15, 1,-1,-1,"[2,4]", 1.5, 1, 3, 3],[ 4, 4,"Boss","Boss", 600, 200, 5, 10, 10,"[2,4]", 1,0.5, 20,-1]]},"TowersInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","SearchArea","RotateSpeed","GCD"],"Values":[[ 0, 0,"PowerCore","\u7535\u529B\u6838\u5FC3", 1, 2000, 0, 0, 0],[ 1, 1,"DoubleTubeTower","\u53CC\u7BA1\u901F\u5C04\u70AE", 1, 2500, 8,0.2, 1],[ 2, 2,"GatlingTower","\u4E94\u8054\u52A0\u7279\u6797", 1, 2500, 10,0.4,0.1],[ 3, 3,"ElectroTower","\u8D85\u5BFC\u7535\u78C1\u70AE", 1, 2500, 10,0.4, 2]]},"GunsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Recoil","ShootRate"],"Values":[[ 0, 0,"PistolGun","\u521D\u59CB\u67AA", 1, 20, 10],[ 1, 1,"QuickGun","\u901F\u51FB\u67AA", 1, 80, 1.5],[ 2, 2,"LaserGun","\u6FC0\u5149\u67AA", 1, 20, 1],[ 3, 3,"LightSphereGun","\u7535\u7403\u67AA", 1, 20, 1],[ 4, 4,"BeamGun","\u5149\u675F\u67AA", 1, 20, 1],[ 5, 5,"GrenadeGun","\u69B4\u5F39\u67AA", 1, 20,0.8]]},"BulletsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Damage","DeToughness"],"Values":[[ 0, 0,"PistolBullet","\u521D\u59CB\u67AA\u5B50\u5F39", 1, 1, 0],[ 1, 1,"QuickBullet","\u5FEB\u5F39", 1, 1, 10],[ 2, 2,"LaserBullet","\u6FC0\u5149\u5B50\u5F39", 1, 3, 0],[ 3, 3,"LightSphereBullet","\u7535\u7403\u5B50\u5F39", 1, 5, 0],[ 4, 4,"BeamBullet","\u5149\u675F", 1, 3, 0],[ 5, 5,"GrenadeBullet","\u69B4\u5F39", 1, 8, 0]]},"DefensesInfo":{"Columns":["ID","TowerType","BornPos","BornAngleY"],"Values":[[ 0, 0,"(1.08,0,2.8)", 0],[ 1, 1,"(-4.75,0,4.57)", 49.615],[ 2, 1,"(-5.73,0,6.02)", 47.998],[ 3, 1,"(-1.03,0,7.17)",-126.925],[ 4, 1,"(-2.25,0,8.68)",-128.42],[ 5, 2,"(-1.65,0,3.91)",-34.406],[ 6, 2,"(0.54,0,5.18)",-36.403],[ 7, 3,"(-4.6,0,2.06)",-32.015]]},"TitleInfo":{"Columns":["ID","Id","TitleName"],"Values":[[ 1, 0,"\u521D\u9732\u950B\u8292"],[ 2, 1,"\u5C0F\u83DC\u4E00\u789F"],[ 3, 2,"\u719F\u624B"],[ 4, 3,"\u75DB\u5E76\u5FEB\u4E50\u7740"],[ 5, 4,"\u4E0D\u6B7B\u4F20\u8BF4"],[ 6, 5,"\u4E00\u9A91\u7EDD\u5C18"],[ 7, 6,"\u6700\u5F3A\u5B88\u62A4\u8005"],[ 8, 7,"\u72EC\u5B64\u6C42\u8D25"],[ 9, 8,"\u4F5B\u7CFB\u73A9\u5BB6"],[ 10, 9,"\u5348\u65F6\u5DF2\u5230"],[ 11, 10,"\u795E\u67AA\u624B"],[ 12, 11,"\u5F39\u65E0\u865A\u53D1"],[ 13, 12,"\u56E2\u961F\u62A4\u76FE"],[ 14, 13,"\u6211\u53EBMT"],[ 15, 14,"\u94A2\u94C1\u4E4B\u8EAF"],[ 16, 15,"\u9053\u5177\u5927\u5E08"],[ 17, 16,"\u884C\u8D70\u7684\u4ED3\u5E93"],[ 18, 17,"\u6C38\u4E0D\u505C\u6B47"]]},"StoryProgressInfo":{"Columns":["ID","Belong","EnemyType","BornTime"],"Values":[[ 0, 0,"[2,2,2]", 1],[ 1, 1,"[0,0,0]", 1],[ 2, 2,"[3,3,3]", 1],[ 3, 3,"[1,1,1]", 1],[ 4, 4,"[2,2,2,2,2]", 1],[ 5, 5,"[3,3,3,3,3,3]", 1],[ 6, 6,"[0,0,0,0,0,0,3,3,3,1]", 1]]}} +{"EnemysInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","Atk","SpecialAtk1","SpecialAtk2","AtkArea","Speed","Frequency","Score","Weight"],"Values":[[ 0, 0,"ThinZombie","\u7626\u5B50\u50F5\u5C38", 1, 10, 1,-1,-1,"[3,4]", 1, 1, 2, 2],[ 1, 1,"FatZombie","\u80D6\u5B50\u50F5\u5C38", 2, 30, 4,-1,-1,"[3,6]",0.5,0.5, 6, 6],[ 2, 2,"ExplosionDog","\u81EA\u7206\u72D7", 1, 5, 1, 1,-1,"[3,5]", 2, 1.5, 1, 1],[ 3, 3,"RunZombie","\u8DD1\u6B65\u50F5\u5C38", 2, 15, 1,-1,-1,"[3,4]", 1.5, 1, 3, 3],[ 4, 4,"Boss","Boss", 600, 200, 5, 10, 10,"[3,4]", 1,0.5, 20,-1]]},"TowersInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","SearchArea","RotateSpeed","GCD"],"Values":[[ 0, 0,"PowerCore","\u7535\u529B\u6838\u5FC3", 1, 2000, 0, 0, 0],[ 1, 1,"DoubleTubeTower","\u53CC\u7BA1\u901F\u5C04\u70AE", 1, 2500, 8,0.2, 1],[ 2, 2,"GatlingTower","\u4E94\u8054\u52A0\u7279\u6797", 1, 2500, 10,0.4,0.1],[ 3, 3,"ElectroTower","\u8D85\u5BFC\u7535\u78C1\u70AE", 1, 2500, 10,0.4, 2]]},"GunsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Recoil","ShootRate"],"Values":[[ 0, 0,"PistolGun","\u521D\u59CB\u67AA", 1, 20, 10],[ 1, 1,"QuickGun","\u901F\u51FB\u67AA", 1, 80, 1.5],[ 2, 2,"LaserGun","\u6FC0\u5149\u67AA", 1, 20, 1],[ 3, 3,"LightSphereGun","\u7535\u7403\u67AA", 1, 20, 3],[ 4, 4,"BeamGun","\u5149\u675F\u67AA", 1, 20, 10],[ 5, 5,"GrenadeGun","\u69B4\u5F39\u67AA", 1, 20,0.8]]},"BulletsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Damage","DeToughness"],"Values":[[ 0, 0,"PistolBullet","\u521D\u59CB\u67AA\u5B50\u5F39", 1, 1, 0],[ 1, 1,"QuickBullet","\u5FEB\u5F39", 1, 1, 10],[ 2, 2,"LaserBullet","\u6FC0\u5149\u5B50\u5F39", 1, 3, 0],[ 3, 3,"LightSphereBullet","\u7535\u7403\u5B50\u5F39", 1, 5, 0],[ 4, 4,"BeamBullet","\u5149\u675F", 1, 3, 0],[ 5, 5,"GrenadeBullet","\u69B4\u5F39", 1, 8, 0]]},"DefensesInfo":{"Columns":["ID","TowerType","BornPos","BornAngleY"],"Values":[[ 0, 0,"(1.08,0,2.8)", 0],[ 1, 1,"(-4.75,0,4.57)", 49.615],[ 2, 1,"(-5.73,0,6.02)", 47.998],[ 3, 1,"(-1.03,0,7.17)",-126.925],[ 4, 1,"(-2.25,0,8.68)",-128.42],[ 5, 2,"(-1.65,0,3.91)",-34.406],[ 6, 2,"(0.54,0,5.18)",-36.403],[ 7, 3,"(-4.6,0,2.06)",-32.015]]},"TitleInfo":{"Columns":["ID","Id","TitleName"],"Values":[[ 1, 0,"\u521D\u9732\u950B\u8292"],[ 2, 1,"\u5C0F\u83DC\u4E00\u789F"],[ 3, 2,"\u719F\u624B"],[ 4, 3,"\u75DB\u5E76\u5FEB\u4E50\u7740"],[ 5, 4,"\u4E0D\u6B7B\u4F20\u8BF4"],[ 6, 5,"\u4E00\u9A91\u7EDD\u5C18"],[ 7, 6,"\u6700\u5F3A\u5B88\u62A4\u8005"],[ 8, 7,"\u72EC\u5B64\u6C42\u8D25"],[ 9, 8,"\u4F5B\u7CFB\u73A9\u5BB6"],[ 10, 9,"\u5348\u65F6\u5DF2\u5230"],[ 11, 10,"\u795E\u67AA\u624B"],[ 12, 11,"\u5F39\u65E0\u865A\u53D1"],[ 13, 12,"\u56E2\u961F\u62A4\u76FE"],[ 14, 13,"\u6211\u53EBMT"],[ 15, 14,"\u94A2\u94C1\u4E4B\u8EAF"],[ 16, 15,"\u9053\u5177\u5927\u5E08"],[ 17, 16,"\u884C\u8D70\u7684\u4ED3\u5E93"],[ 18, 17,"\u6C38\u4E0D\u505C\u6B47"]]},"StoryProgressInfo":{"Columns":["ID","Belong","EnemyType","BornTime"],"Values":[[ 0, 0,"[2,2,2]", 1],[ 1, 1,"[0,0,0]", 1],[ 2, 2,"[3,3,3]", 1],[ 3, 3,"[1,1,1]", 1],[ 4, 4,"[2,2,2,2,2]", 1],[ 5, 5,"[3,3,3,3,3,3]", 1],[ 6, 6,"[0,0,0,0,0,0,3,3,3,1]", 1]]}} diff --git a/Assets/_Zombie/Resources/ToyStory.xlsm b/Assets/_Zombie/Resources/ToyStory.xlsm index 178793e8..96e1a558 100644 Binary files a/Assets/_Zombie/Resources/ToyStory.xlsm and b/Assets/_Zombie/Resources/ToyStory.xlsm differ diff --git a/Assets/_Zombie/Scenes/Company1Floor.unity b/Assets/_Zombie/Scenes/Company1Floor.unity index 09166875..7ab93057 100644 --- a/Assets/_Zombie/Scenes/Company1Floor.unity +++ b/Assets/_Zombie/Scenes/Company1Floor.unity @@ -1150,6 +1150,12 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &142391316 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1420782355} + m_PrefabAsset: {fileID: 0} --- !u!1 &151987306 GameObject: m_ObjectHideFlags: 0 @@ -4770,6 +4776,12 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &561415590 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1392422859} + m_PrefabAsset: {fileID: 0} --- !u!1001 &562781621 PrefabInstance: m_ObjectHideFlags: 0 @@ -6649,7 +6661,7 @@ MonoBehaviour: IncludeChildColliders: 0 RuntimeFollower: {fileID: 0} colliderMaxDistance: 100 - lastTimeMaxDistanceCalced: 638921658874499554 + lastTimeMaxDistanceCalced: 638921698526619184 --- !u!1 &679496949 GameObject: m_ObjectHideFlags: 0 @@ -7422,6 +7434,12 @@ Transform: - {fileID: 448952877} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &791621195 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1320936988} + m_PrefabAsset: {fileID: 0} --- !u!1 &793457652 GameObject: m_ObjectHideFlags: 0 @@ -9328,6 +9346,12 @@ MonoBehaviour: soundPlayedCustomEvent: willCleanUpDelegatesAfterStop: 1 frames: 178 +--- !u!1 &1007934005 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 562781621} + m_PrefabAsset: {fileID: 0} --- !u!1 &1021883619 GameObject: m_ObjectHideFlags: 0 @@ -12567,6 +12591,11 @@ MonoBehaviour: - {fileID: 1134898388} - {fileID: 450657585} doorPos: {fileID: 1128989868} + wu: + - {fileID: 142391316} + - {fileID: 561415590} + - {fileID: 791621195} + - {fileID: 1007934005} --- !u!1 &1292553882 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity b/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity index 0cacbdcd..7aa1935e 100644 --- a/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity +++ b/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity @@ -12424,6 +12424,11 @@ MonoBehaviour: - {fileID: 1134898388} - {fileID: 450657585} doorPos: {fileID: 1128989868} + wu: + - {fileID: 1792346352} + - {fileID: 1427999264} + - {fileID: 1998719544} + - {fileID: 1986664621} --- !u!1 &1292553882 GameObject: m_ObjectHideFlags: 0 @@ -13080,6 +13085,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1427999262} m_PrefabAsset: {fileID: 0} +--- !u!1 &1427999264 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1427999262} + m_PrefabAsset: {fileID: 0} --- !u!1 &1435427328 GameObject: m_ObjectHideFlags: 0 @@ -15554,6 +15565,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1792346350} m_PrefabAsset: {fileID: 0} +--- !u!1 &1792346352 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1792346350} + m_PrefabAsset: {fileID: 0} --- !u!1 &1796492097 GameObject: m_ObjectHideFlags: 0 @@ -16985,6 +17002,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1986664619} m_PrefabAsset: {fileID: 0} +--- !u!1 &1986664621 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1986664619} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1998719542 PrefabInstance: m_ObjectHideFlags: 0 @@ -17069,6 +17092,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1998719542} m_PrefabAsset: {fileID: 0} +--- !u!1 &1998719544 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 1998719542} + m_PrefabAsset: {fileID: 0} --- !u!1 &2005956688 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scripts/GameLocal.cs b/Assets/_Zombie/Scripts/GameLocal.cs index a10a72d0..7369cd00 100644 --- a/Assets/_Zombie/Scripts/GameLocal.cs +++ b/Assets/_Zombie/Scripts/GameLocal.cs @@ -68,6 +68,7 @@ public class GameLocal : MonoBehaviour public Transform[] gunPropPos; public Transform doorPos; + public GameObject[] wu; void Start() { Ins = this; @@ -153,4 +154,19 @@ public class GameLocal : MonoBehaviour #endif return res; } + public void CloseWu() + { + foreach (GameObject obj in wu) + { + obj.SetActive(false); + } + } + + public void OpenWu() + { + foreach (var obj in wu) + { + obj.SetActive(true); + } + } } diff --git a/Assets/_Zombie/Scripts/GameManager.cs b/Assets/_Zombie/Scripts/GameManager.cs index 79df65f7..d4a80598 100644 --- a/Assets/_Zombie/Scripts/GameManager.cs +++ b/Assets/_Zombie/Scripts/GameManager.cs @@ -203,7 +203,7 @@ public class GameManager : NetworkBehaviour public void GivePistol() { Debug.Log("创建武器中..."); - GameLocal.Ins.self.PickUpGun(GunType.Pistol, -999); + GameLocal.Ins.self.PickUpGun(GunType.FireGun, 20); } [Server] @@ -308,6 +308,7 @@ public class GameManager : NetworkBehaviour EnemyList.Add(enemyIndex, enemyScript); yield return new WaitForSeconds(info.BornTime); } + GameLocal.Ins.CloseWu(); } public void CreateBoss() @@ -391,7 +392,7 @@ public class GameManager : NetworkBehaviour int totalWeight = 0; int targetWeight = Random.Range(24, 27); // 24-26 - int targetCount = Random.Range(5, 11); // 5-10 + int targetCount = Random.Range(4, 6); // 4-6 // 随机添加怪物直到接近目标 while (monsterTypes.Count < targetCount && totalWeight < targetWeight) @@ -423,6 +424,7 @@ public class GameManager : NetworkBehaviour totalWeight += weights[minIndex]; } + Debug.LogError("生成的敌人数量:"+targetCount); return monsterTypes.ToArray(); } @@ -476,6 +478,7 @@ public class GameManager : NetworkBehaviour { CreateGunProp(); CreateNextRound(); + GameLocal.Ins.OpenWu(); } } /// diff --git a/Assets/_Zombie/Scripts/Guns/Launcher.cs b/Assets/_Zombie/Scripts/Guns/Launcher.cs index dc65686b..cb5109dc 100644 --- a/Assets/_Zombie/Scripts/Guns/Launcher.cs +++ b/Assets/_Zombie/Scripts/Guns/Launcher.cs @@ -140,7 +140,6 @@ public class Launcher : NetworkBehaviour bullet_amount--; EventDispatcher.TriggerEvent("UserGun", bullet_amount); } - if (bullet_amount <= 0 && bullet_amount != -999) { LauncherEmpty(); @@ -183,7 +182,7 @@ public class Launcher : NetworkBehaviour { return; } - bullet_amount += amount; + bullet_amount = amount; } public void SetBulletAmount(int amount,int ownerIndex) @@ -238,4 +237,6 @@ public class Launcher : NetworkBehaviour }, shell_despawn_delay); } } + + } diff --git a/Assets/_Zombie/Scripts/Guns/NewGun/Gun2.cs b/Assets/_Zombie/Scripts/Guns/NewGun/Gun2.cs index 18c9645c..27ff4bad 100644 --- a/Assets/_Zombie/Scripts/Guns/NewGun/Gun2.cs +++ b/Assets/_Zombie/Scripts/Guns/NewGun/Gun2.cs @@ -141,7 +141,8 @@ public class Gun2 : Launcher { lastDamageTime = Time.time; } - + + Debug.LogError("剩余子弹数量:"+bullet_amount); SetShot(true); // 武器寿命逻辑 if (bullet_amount<=0) diff --git a/Assets/_Zombie/Scripts/Guns/NewGun/Gun3.cs b/Assets/_Zombie/Scripts/Guns/NewGun/Gun3.cs index afb81781..b6faf096 100644 --- a/Assets/_Zombie/Scripts/Guns/NewGun/Gun3.cs +++ b/Assets/_Zombie/Scripts/Guns/NewGun/Gun3.cs @@ -120,12 +120,13 @@ public class Gun3 : Launcher } } SetShot(true); + if (Time.time - lastDamageTime >= damageInterval) { lastDamageTime = Time.time; } } - + Debug.LogError("剩余子弹数量:"+bullet_amount); // 武器寿命逻辑 if (bullet_amount<=0) { diff --git a/Assets/_Zombie/Scripts/UI/HUDPanel.cs b/Assets/_Zombie/Scripts/UI/HUDPanel.cs index 18c53d8e..9b313c01 100644 --- a/Assets/_Zombie/Scripts/UI/HUDPanel.cs +++ b/Assets/_Zombie/Scripts/UI/HUDPanel.cs @@ -129,6 +129,7 @@ public class HUDPanel : MonoBehaviour IEnumerator RoundWaveTime() { + GameManager.Ins.PlaySound2DRPC("1.1"); int time = 3; while (time>0) { @@ -137,10 +138,9 @@ public class HUDPanel : MonoBehaviour time--; } Round.SetActive(false); - GameManager.Ins.PlaySound2DRPC(""); + } - - + public void ChangeGunIcon(int bulletIndex) { gunImage.sprite = gunIcons[GameLocal.Ins.self.NowGunIndex]; diff --git a/Assets/sucai/Epic Toon FX/Materials/Glows/lightray2.mat b/Assets/sucai/Epic Toon FX/Materials/Glows/lightray2.mat index 5da944bd..27f451b3 100644 --- a/Assets/sucai/Epic Toon FX/Materials/Glows/lightray2.mat +++ b/Assets/sucai/Epic Toon FX/Materials/Glows/lightray2.mat @@ -8,28 +8,79 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: lightray2 - m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_ValidKeywords: + - _EMISSION + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 79849d374503de94dbb82cd0b025dfe8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 79849d374503de94dbb82cd0b025dfe8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendOp: 0 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _InvFade: 1 + - _Mode: 0 + - _QueueOffset: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _ZWrite: 0 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png new file mode 100644 index 00000000..046d0eaf Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png.meta similarity index 64% rename from Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga.meta rename to Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png.meta index 41934256..05d5f981 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga.meta +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 33efcffc11cefa948a812251045793fa +guid: 4fb84c0b0549e0b42857ed3cfc5298e5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,27 +20,30 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + flipGreenChannel: 0 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 128 + textureFormat: 1 + maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 - nPOTScale: 1 + wrapW: 0 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,38 +52,58 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 1 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 128 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 128 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 spriteSheet: @@ -89,16 +112,16 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga deleted file mode 100644 index 484ffc11..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga.meta deleted file mode 100644 index 4b05ea16..00000000 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_001.tga.meta +++ /dev/null @@ -1,104 +0,0 @@ -fileFormatVersion: 2 -guid: d1fc7c41b24f0364190ae180d917a415 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 4096 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png new file mode 100644 index 00000000..059307a1 Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png.meta similarity index 63% rename from Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga.meta rename to Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png.meta index a76b20f9..d22e9392 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga.meta +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4035f91e87261534087dc35244cd9e96 +guid: 5b8b731c9068f444cb6c869e3e1fe7c5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,27 +20,30 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + flipGreenChannel: 0 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 256 + textureFormat: 1 + maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 - wrapU: 0 - wrapV: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,38 +52,58 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 1 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 spriteSheet: @@ -89,16 +112,16 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga deleted file mode 100644 index 2928c138..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png new file mode 100644 index 00000000..f37f5a81 Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png.meta similarity index 65% rename from Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga.meta rename to Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png.meta index 19217ce8..84b896cd 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga.meta +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: c2715d3091134ed4792dc2b5415d3867 +guid: 39b1bdac3f331b440bfda0ab906df6e5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,24 +20,27 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + flipGreenChannel: 0 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 256 + textureFormat: 1 + maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 - nPOTScale: 1 + wrapW: 0 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -49,38 +52,58 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 2 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 1 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 spriteSheet: @@ -96,9 +119,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga deleted file mode 100644 index 04ce26c6..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Plasma Beam/Textures/plasma_beam_hit_red.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_explosion_02.mat b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_explosion_02.mat index bd87646d..dc089e0a 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_explosion_02.mat +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_explosion_02.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: seeker_bolt_explosion_02 - m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -31,7 +31,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: ce29ce83088f43047b570c9723a7f3a0, type: 3} + m_Texture: {fileID: 2800000, guid: 5b8b731c9068f444cb6c869e3e1fe7c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_flare.mat b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_flare.mat index eaf5c789..89bfd3d0 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_flare.mat +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_flare.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: seeker_bolt_flare - m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -44,7 +44,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 33efcffc11cefa948a812251045793fa, type: 3} + m_Texture: {fileID: 2800000, guid: 39b1bdac3f331b440bfda0ab906df6e5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_fragment.mat b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_fragment.mat index 682ac68f..176e5dcd 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_fragment.mat +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_fragment.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: seeker_bolt_fragment - m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -44,7 +44,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: c2715d3091134ed4792dc2b5415d3867, type: 3} + m_Texture: {fileID: 2800000, guid: 011a64024895fdd4a861486af6582235, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_sparks.mat b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_sparks.mat index 9607f176..f240fad2 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_sparks.mat +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Materials/seeker_bolt_sparks.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: seeker_bolt_sparks - m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -44,7 +44,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 4035f91e87261534087dc35244cd9e96, type: 3} + m_Texture: {fileID: 2800000, guid: 30f714ee948c7e44486df97beeb83f91, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png new file mode 100644 index 00000000..1ed5e462 Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png.meta similarity index 63% rename from Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga.meta rename to Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png.meta index 614e2387..9a1ffbb7 100644 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Explosions/Textures/Explosion_002.tga.meta +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: ce29ce83088f43047b570c9723a7f3a0 +guid: 30f714ee948c7e44486df97beeb83f91 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,27 +20,30 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + flipGreenChannel: 0 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 4096 + textureFormat: 1 + maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,38 +52,58 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - applyGammaDecoding: 1 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 spriteSheet: @@ -89,16 +112,16 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga deleted file mode 100644 index 06e242a2..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Seeker Bolt/Textures/seeker_bolt_flare.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png new file mode 100644 index 00000000..e8a14519 Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png.meta new file mode 100644 index 00000000..55ddb01f --- /dev/null +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 011a64024895fdd4a861486af6582235 +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: 0 + 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: 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 + 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/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga deleted file mode 100644 index 404450f0..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_flare_02.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png new file mode 100644 index 00000000..61df8611 Binary files /dev/null and b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png.meta new file mode 100644 index 00000000..022d70c9 --- /dev/null +++ b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 27edffef56146584aa656a498c2d512a +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: 0 + 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: 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 + 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/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga deleted file mode 100644 index d110e369..00000000 Binary files a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga and /dev/null differ diff --git a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga.meta b/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga.meta deleted file mode 100644 index 62dca8d1..00000000 --- a/Assets/sucai/FORGE3D/Sci-Fi Effects/Effects/Solo Gun/Textures/solo_gun_sparks.tga.meta +++ /dev/null @@ -1,104 +0,0 @@ -fileFormatVersion: 2 -guid: e8d4f1114806e094abb5b8013fa3ef2d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 128 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5fd444f3..48bbcc28 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,10 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/_Zombie/Scenes/Company1Floor.unity guid: 386a8fdea01af8a4e8d4a9835407ddec - - enabled: 1 + - enabled: 0 path: Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity guid: df8c4c84bf9690442a51ed602038e198 m_configObjects: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 92ab9c74..15b3919d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -165,7 +165,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.zombie.zhejiangshaoxingshengzhouwuyueguangchang + Android: com.pineappletech.zombie.gongsi1lou Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0