匹配场景，修改关卡分数，优化女助手欢呼动画

snipershooting/Data/exports/TableData.cs

@@ -16,11 +16,6 @@ namespace SSTRGame
 		public tabtoy.Logger TableLogger = new tabtoy.Logger();
 	
 		
-		/// <summary> 
-		/// FieldShapeData
-		/// </summary>
-		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
-		
 		/// <summary> 
 		/// ChallengeData
 		/// </summary>
@@ -31,6 +26,11 @@ namespace SSTRGame
 		/// </summary>
 		public List<FieldDataDefine> FieldData = new List<FieldDataDefine>(); 
 		
+		/// <summary> 
+		/// FieldShapeData
+		/// </summary>
+		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
+		
 		/// <summary> 
 		/// GameConfig
 		/// </summary>
@@ -88,23 +88,7 @@ namespace SSTRGame
 	
 	
 		#region Index code
-	 	Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
-        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
-        {
-            FieldShapeDataDefine ret;
-            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
-            {
-                return ret;
-            }
-			
-			if ( def == default(FieldShapeDataDefine) )
-			{
-				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
-			}
-
-            return def;
-        }
-		Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
+	 	Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
         public ChallengeDataDefine GetChallengeDataByID(int ID, ChallengeDataDefine def = default(ChallengeDataDefine))
         {
             ChallengeDataDefine ret;
@@ -134,6 +118,22 @@ namespace SSTRGame
 				TableLogger.ErrorLine("GetFieldDataByID failed, ID: {0}", ID);
 			}
 
+            return def;
+        }
+		Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
+        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
+        {
+            FieldShapeDataDefine ret;
+            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
+            {
+                return ret;
+            }
+			
+			if ( def == default(FieldShapeDataDefine) )
+			{
+				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
+			}
+
             return def;
         }
 		Dictionary<int, GameConfigDefine> _GameConfigByid = new Dictionary<int, GameConfigDefine>();
@@ -343,17 +343,17 @@ namespace SSTRGame
                 { 
                 	case 0xa0000:
                 	{
-						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
+						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0001:
                 	{
-						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
+						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0002:
                 	{
-						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
+						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0003:
@@ -415,15 +415,6 @@ namespace SSTRGame
              } 
 
 			
-			// Build FieldShapeData Index
-			for( int i = 0;i< ins.FieldShapeData.Count;i++)
-			{
-				var element = ins.FieldShapeData[i];
-				
-				ins._FieldShapeDataByID.Add(element.ID, element);
-				
-			}
-			
 			// Build ChallengeData Index
 			for( int i = 0;i< ins.ChallengeData.Count;i++)
 			{
@@ -442,6 +433,15 @@ namespace SSTRGame
 				
 			}
 			
+			// Build FieldShapeData Index
+			for( int i = 0;i< ins.FieldShapeData.Count;i++)
+			{
+				var element = ins.FieldShapeData[i];
+				
+				ins._FieldShapeDataByID.Add(element.ID, element);
+				
+			}
+			
 			// Build GameConfig Index
 			for( int i = 0;i< ins.GameConfig.Count;i++)
 			{
@@ -542,20 +542,20 @@ namespace SSTRGame
 			}
 			
 		}
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldShapeDataDefineDeserializeHandler == null )
+				if (_ChallengeDataDefineDeserializeHandler == null )
 				{
-					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
+					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
 				}
 
-				return _FieldShapeDataDefineDeserializeHandler;
+				return _ChallengeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -568,29 +568,34 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60001:
+                	case 0x10001:
                 	{
-						ins.ResourceName = reader.ReadString();
+						ins.FieldID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60002:
+                	case 0x10002:
                 	{
-						ins.EnvSoundName = reader.ReadString();
+						ins.DecStaminaCnt = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60003:
+                	case 0x10003:
                 	{
-						ins.EnvParticleName = reader.ReadString();
+						ins.ConstraintType = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60004:
+                	case 0x10004:
                 	{
-						ins.AttendAnim.Add( reader.ReadString() );
+						ins.ConstraintValue = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10005:
                 	{
-						ins.LoadMethod = reader.ReadInt32();
+						ins.Condition.Add( reader.ReadInt32() );
+                	}
+                	break; 
+                	case 0x10006:
+                	{
+						ins.Reward_ID_1 = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -598,20 +603,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_ChallengeDataDefineDeserializeHandler == null )
+				if (_FieldDataDefineDeserializeHandler == null )
 				{
-					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
+					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
 				}
 
-				return _ChallengeDataDefineDeserializeHandler;
+				return _FieldDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -626,32 +631,22 @@ namespace SSTRGame
                 	break; 
                 	case 0x10001:
                 	{
-						ins.FieldID = reader.ReadInt32();
+						ins.RoundFactorGroupID = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10002:
                 	{
-						ins.DecStaminaCnt = reader.ReadInt32();
+						ins.FieldShapeID = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10003:
                 	{
-						ins.ConstraintType = reader.ReadInt32();
-                	}
-                	break; 
-                	case 0x10004:
-                	{
-						ins.ConstraintValue = reader.ReadInt32();
-                	}
-                	break; 
-                	case 0x10005:
-                	{
-						ins.Condition.Add( reader.ReadInt32() );
+						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
                 	}
                 	break; 
-                	case 0x10006:
+                	case 0x60004:
                 	{
-						ins.Reward_ID_1 = reader.ReadInt32();
+						ins.Mark = reader.ReadString();
                 	}
                 	break; 
                 }
@@ -659,20 +654,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldDataDefineDeserializeHandler == null )
+				if (_FieldShapeDataDefineDeserializeHandler == null )
 				{
-					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
+					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
 				}
 
-				return _FieldDataDefineDeserializeHandler;
+				return _FieldShapeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -685,24 +680,29 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x10001:
+                	case 0x60001:
                 	{
-						ins.RoundFactorGroupID = reader.ReadInt32();
+						ins.ResourceName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10002:
+                	case 0x60002:
                 	{
-						ins.FieldShapeID = reader.ReadInt32();
+						ins.EnvSoundName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10003:
+                	case 0x60003:
                 	{
-						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
+						ins.EnvParticleName = reader.ReadString();
                 	}
                 	break; 
                 	case 0x60004:
                 	{
-						ins.Mark = reader.ReadString();
+						ins.AttendAnim.Add( reader.ReadString() );
+                	}
+                	break; 
+                	case 0x10005:
+                	{
+						ins.LoadMethod = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -1885,9 +1885,9 @@ namespace SSTRGame
 		#region Clear Code
 		public void Clear( )
 		{			
-				FieldShapeData.Clear(); 		
 				ChallengeData.Clear(); 		
 				FieldData.Clear(); 		
+				FieldShapeData.Clear(); 		
 				GameConfig.Clear(); 		
 				Language.Clear(); 		
 				Level.Clear(); 		
@@ -1900,9 +1900,9 @@ namespace SSTRGame
 				WeaponPart.Clear(); 		
 				WeaponProperty.Clear(); 
 			
-				_FieldShapeDataByID.Clear(); 
 				_ChallengeDataByID.Clear(); 
 				_FieldDataByID.Clear(); 
+				_FieldShapeDataByID.Clear(); 
 				_GameConfigByid.Clear(); 
 				_LanguageByid.Clear(); 
 				_LevelByID.Clear(); 
@@ -1920,9 +1920,9 @@ namespace SSTRGame
 
 	} 
 
-	// Defined in table: FieldShapeData
+	// Defined in table: ChallengeData
 	
-	public partial class FieldShapeDataDefine
+	public partial class ChallengeDataDefine
 	{
 	
 		
@@ -1932,29 +1932,30 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public string ResourceName = ""; 
+		public int FieldID = 0; 
 		
 		
-		public string EnvSoundName = ""; 
+		public int DecStaminaCnt = 0; 
 		
 		
-		public string EnvParticleName = ""; 
+		public int ConstraintType = 0; 
 		
-		/// <summary> 
-		/// 开场动画，多选一
-		/// </summary>
-		public List<string> AttendAnim = new List<string>(); 
+		
+		public int ConstraintValue = 0; 
 		
 		
-		public int LoadMethod = 0; 
+		public List<int> Condition = new List<int>(); 
+		
+		
+		public int Reward_ID_1 = 0; 
 	
 	
 
 	} 
 
-	// Defined in table: ChallengeData
+	// Defined in table: FieldData
 	
-	public partial class ChallengeDataDefine
+	public partial class FieldDataDefine
 	{
 	
 		
@@ -1964,30 +1965,24 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int FieldID = 0; 
-		
-		
-		public int DecStaminaCnt = 0; 
-		
-		
-		public int ConstraintType = 0; 
+		public int RoundFactorGroupID = 0; 
 		
 		
-		public int ConstraintValue = 0; 
+		public int FieldShapeID = 0; 
 		
 		
-		public List<int> Condition = new List<int>(); 
+		public List<int> DefaultPlayerPos = new List<int>(); 
 		
 		
-		public int Reward_ID_1 = 0; 
+		public string Mark = ""; 
 	
 	
 
 	} 
 
-	// Defined in table: FieldData
+	// Defined in table: FieldShapeData
 	
-	public partial class FieldDataDefine
+	public partial class FieldShapeDataDefine
 	{
 	
 		
@@ -1997,16 +1992,21 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int RoundFactorGroupID = 0; 
+		public string ResourceName = ""; 
 		
 		
-		public int FieldShapeID = 0; 
+		public string EnvSoundName = ""; 
 		
 		
-		public List<int> DefaultPlayerPos = new List<int>(); 
+		public string EnvParticleName = ""; 
 		
+		/// <summary> 
+		/// 开场动画，多选一
+		/// </summary>
+		public List<string> AttendAnim = new List<string>(); 
 		
-		public string Mark = ""; 
+		
+		public int LoadMethod = 0; 
 	
 	
 

snipershooting/ShootSniper/Assets/Arts/ExoticFruits/Materials/Starfruit.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Starfruit
   m_Shader: {fileID: 4800000, guid: 4e7a479053926419998871506c73a516, type: 3}
-  m_ShaderKeywords: GRAY_OFF _FadeByHeight
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - GRAY_OFF
+  - _FadeByHeight
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -23,6 +29,7 @@ Material:
         m_Texture: {fileID: 2800000, guid: b06907624db5ac3439f61c14ae1efca8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Gross: 3.5
     - _LightProbeInt: 0.05
@@ -30,6 +37,7 @@ Material:
     - _ShadowFalloff: 0.62
     m_Colors:
     - _LightColor: {r: 1, g: 0.96, b: 0.84, a: 1}
-    - _LightDir: {r: 0.6, g: -1, b: 0.6, a: 0.01}
+    - _LightDir: {r: -0.58553445, g: -0.7660443, b: 0.2651897, a: 0.01}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.58}
     - _SpecularColor: {r: 0.816, g: 0.816, b: 0.816, a: 1}
+  m_BuildTextureStacks: []

snipershooting/ShootSniper/Assets/Resources_moved/Prefabs/Targets/nvzhushou.prefab

@@ -5642,13 +5642,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8665645513544363217}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.76654136, y: -0.47381562, z: 0.419795, w: 0.10809871}
-  m_LocalPosition: {x: -0.075, y: 0.192, z: -0.092}
-  m_LocalScale: {x: 0.5766897, y: 0.5766899, z: 0.5766898}
+  m_LocalRotation: {x: -0.672235, y: -0.5248157, z: 0.48404902, w: 0.19587019}
+  m_LocalPosition: {x: -0.075, y: 0.188, z: -0.087}
+  m_LocalScale: {x: 0.52061814, y: 0.5206183, z: 0.5206182}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3185216212908387293}
-  m_LocalEulerAnglesHint: {x: -193.42, y: 50.082, z: -57.149994}
+  m_LocalEulerAnglesHint: {x: -194.166, y: 62.036003, z: -67.412994}
 --- !u!1 &8690018934490256745
 GameObject:
   m_ObjectHideFlags: 0

snipershooting/ShootSniper/Assets/ShootGame/Resources_moved/Prefabs/ArmWeapon_Camouflage_Gew98Noscope_Common.prefab

@@ -85,7 +85,7 @@ MonoBehaviour:
   crosshairPosition50: {x: 0, y: -0.15, z: 0}
   crosshairRotation: {x: 0, y: 180, z: 0}
   crosshairScale50: {x: 0.5, y: 0.5, z: 0.5}
-  eyeCamFOV: 50
+  eyeCamFOV: 60
   eyeCamPosZ: 0.95
   scopeFOVMax: 15
   rotateSpeedRatio: {x: 0.004, y: 0.004}
@@ -111,6 +111,7 @@ MonoBehaviour:
   oldScope: {fileID: 0}
   IsFinishShowGun: 0
   m_scopeTexture: {fileID: 0}
+  dropChance: 50
   scopeCam: {fileID: 1771094146466494}
   scopeScreen: {fileID: 23755560166751978}
   scopeCrosshair: {fileID: 1406090908436998}

snipershooting/ShootSniper/Assets/ShootGame/Resources_moved/Prefabs/ArmWeapon_Camouflage_Kar98k_Common.prefab

@@ -293,63 +293,39 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _anim: {fileID: 111504065815724744}
   armView: {fileID: 114219081945163736}
-  crosshairName: Crosshair
-  fireStartPos: {fileID: 0}
   _hasScope: 1
-  IsFastGun: 0
   crosshairPosition80: {x: 0, y: -0.1, z: 0}
   crosshairScale80: {x: 0.5, y: 0.5, z: 0.5}
   crosshairPosition50: {x: 0, y: -0.1, z: 0}
   crosshairRotation: {x: 0, y: 180, z: 0}
   crosshairScale50: {x: 0.5, y: 0.5, z: 0.5}
-  eyeCamFOV: 34
+  eyeCamFOV: 50
   eyeCamPosZ: 0.7
-  scopeFOVMin: 23
   scopeFOVMax: 18
   rotateSpeedRatio: {x: 0.004, y: 0.004}
-  shootIncreaseRate: 1
   bulletSpeed: 170
-  shootingDelay: 0.5
-  bulletsInOneShoot: 3
-  oneBulletShootDelay: 0.15
-  baseBodyDamage: 100
-  changeMagazineSpeed: 1.5
-  fireSpeed: 0.7
-  recoilOffset: {x: 0.2, y: 1}
-  recoilOffsetTime: 0.5
   shootingPreparationSpeed: 1.1
   ZoomInCallDelay: 0.75
   shootingFocusDelay: 0.3
   shootingFocusDuration: 0.4
-  partsOfGunAttach: {fileID: 0}
-  glove: {fileID: 0}
   needReload: 1
   reloadSoundDelay: 0.4
   reloadSound: {fileID: 0}
-  fillDelay: 1.2
-  fillInterval: 0.8
-  hasFillOpenSound: 0
-  fillByClip: 0
-  gunShellOuter: {fileID: 0}
-  gunShellObj: {fileID: 0}
   emissionSound: {fileID: 82944518139134592}
   muzzleEffectPos: {fileID: 4791987713370642}
   muzzleEffectPrefab: {fileID: 1062906721548348, guid: 0a34f067ec9dc5c4d9be3d302c94f69d, type: 3}
   muzzleBulletEffectPrefab: {fileID: 0}
   mShooter: {fileID: 0}
   currHitDamage: 0
-  currCritRate: 0
-  accuracyRate: 0
   parts:
   - partType: 3
     weaponPart: {fileID: 7022684720524489449}
   - partType: 4
     weaponPart: {fileID: 1113442053965953583}
   oldScope: {fileID: 5561960315485208344}
-  gunMR: {fileID: 7051032821028061130}
   IsFinishShowGun: 0
   m_scopeTexture: {fileID: 0}
-  _isPlaying: 0
+  dropChance: 50
   scopeCam: {fileID: 0}
   scopeScreen: {fileID: 23302228568780090}
   scopeCrosshair: {fileID: 1606921381084054}
@@ -1410,11 +1386,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 400006, guid: cc6cfe41daf21494bb640da88caac8fb, type: 3}
   m_PrefabInstance: {fileID: 7051032821025761194}
   m_PrefabAsset: {fileID: 0}
---- !u!23 &7051032821028061130 stripped
-MeshRenderer:
-  m_CorrespondingSourceObject: {fileID: 2300000, guid: cc6cfe41daf21494bb640da88caac8fb, type: 3}
-  m_PrefabInstance: {fileID: 7051032821025761194}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7060993270541918590
 PrefabInstance:
   m_ObjectHideFlags: 0