Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound

Assets/Data/ScriptableObjects/Creep/Creep1.asset

@@ -15,12 +15,12 @@ MonoBehaviour:
   id: 1
   memo: "\uAE30\uBCF81"
   moveSpeed: 5
-  maxHp: 100
+  maxHp: 75
   sight: 6
   atkRange: 3
-  atkDamage: 15
-  atkIntervalSec: 1.5
-  cost: 1
+  atkDamage: 10
+  atkIntervalSec: 2
+  cost: 2
   weight: 1
   modelPath: Assets/Models/PlantWarrior.fbx
   animationControllerPath: Assets/Animations/MonsterAnimationController.controller

Assets/Data/ScriptableObjects/Creep/Creep2.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f7bb664a82feb0e43b3c5f459ca775f7, type: 3}
+  m_Name: Creep2
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.CreepData
+  id: 2
+  memo: "\uAE30\uBCF82"
+  moveSpeed: 4.5
+  maxHp: 100
+  sight: 6
+  atkRange: 5
+  atkDamage: 15
+  atkIntervalSec: 4
+  cost: 5
+  weight: 0.5
+  modelPath: Assets/Models/Rogue.fbx
+  animationControllerPath: Assets/Animations/MonsterAnimationController.controller

Assets/Data/ScriptableObjects/Creep/Creep2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3dc093d12ac8e94eac148cbdad689b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DefaultNetworkPrefabs.asset

@@ -209,3 +209,8 @@ MonoBehaviour:
     SourcePrefabToOverride: {fileID: 0}
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 8411033062678718070, guid: 1b51c70b826d97d47bb851e2d8ff758f, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}

Assets/Models/Rogue.fbx.meta

@@ -0,0 +1,270 @@
+fileFormatVersion: 2
+guid: 1f3b492e16c3e69498e92fd7bdbdf42a
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 1
+    materialSearch: 2
+    materialLocation: 0
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 3
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 0
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton:
+    - name: Rogue(Clone)
+      parentName: 
+      position: {x: 0, y: 0, z: 0}
+      rotation: {x: 0, y: 0, z: 0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_Head
+      parentName: Rogue(Clone)
+      position: {x: 0.00000047683716, y: 1.2158737, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rig_Medium
+      parentName: Rogue(Clone)
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: root
+      parentName: Rig_Medium
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: -0.000000021855692, y: -0.000000119209275, z: 2.6054013e-15, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: hips
+      parentName: root
+      position: {x: -0, y: 0.40566343, z: 0}
+      rotation: {x: -5.3290705e-15, y: 0.000000119209275, z: 6.3527476e-22, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: spine
+      parentName: hips
+      position: {x: 2.35e-43, y: 0.1919775, z: 0}
+      rotation: {x: 5.3290705e-15, y: -7.1054274e-15, z: -1.3883952e-28, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: chest
+      parentName: spine
+      position: {x: 3.69611e-29, y: 0.37498796, z: 1.7763568e-15}
+      rotation: {x: 0, y: 4.2351647e-22, z: -0, w: 1}
+      scale: {x: 1, y: 0.99999994, z: 1}
+    - name: upperarm.l
+      parentName: chest
+      position: {x: -0.21200736, y: 0.13413227, z: 0.00000008487841}
+      rotation: {x: -0.514122, y: 0.48546726, z: 0.4854683, w: 0.5141213}
+      scale: {x: 0.99999934, y: 0.99999934, z: 0.9999998}
+    - name: lowerarm.l
+      parentName: upperarm.l
+      position: {x: 3.169376e-10, y: 0.24189739, z: -0.00000011563963}
+      rotation: {x: 3.3142294e-10, y: 0.000000062216756, z: 0.05528553, w: 0.9984706}
+      scale: {x: 1.0000001, y: 0.99999994, z: 1}
+    - name: wrist.l
+      parentName: lowerarm.l
+      position: {x: -0.0000000016788704, y: 0.26004383, z: 0.0000000018543524}
+      rotation: {x: 0.0000000012139638, y: 2.7674268e-10, z: -0.026658101, w: 0.99964464}
+      scale: {x: 0.99999994, y: 1, z: 1}
+    - name: hand.l
+      parentName: wrist.l
+      position: {x: -1.2647661e-12, y: 0.073825896, z: 0.0000001193573}
+      rotation: {x: 5.956492e-10, y: -0.00000013579616, z: 0.000005455195, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: handslot.l
+      parentName: hand.l
+      position: {x: -5.209344e-10, y: 0.096125245, z: -0.057499886}
+      rotation: {x: -0.000000016437694, y: -0.000000019798927, z: 0.7071068, w: 0.7071067}
+      scale: {x: 1, y: 1, z: 1}
+    - name: upperarm.r
+      parentName: chest
+      position: {x: 0.21200736, y: 0.13413227, z: 0.00000008487841}
+      rotation: {x: -0.5141217, y: -0.48546743, z: -0.48546806, w: 0.5141216}
+      scale: {x: 0.99999934, y: 0.99999934, z: 0.9999998}
+    - name: lowerarm.r
+      parentName: upperarm.r
+      position: {x: -2.1567625e-10, y: 0.24189739, z: -0.00000011685303}
+      rotation: {x: 3.314229e-10, y: -0.00000006221675, z: -0.05528553, w: 0.9984706}
+      scale: {x: 1.0000001, y: 0.99999994, z: 1}
+    - name: wrist.r
+      parentName: lowerarm.r
+      position: {x: 0.0000000017586785, y: 0.26004383, z: 0.0000000018543502}
+      rotation: {x: 0.0000000012139642, y: -2.7674288e-10, z: 0.026658101, w: 0.99964464}
+      scale: {x: 0.99999994, y: 1, z: 1}
+    - name: hand.r
+      parentName: wrist.r
+      position: {x: 1.6058266e-12, y: 0.073825896, z: 0.00000011935722}
+      rotation: {x: 5.954004e-10, y: 0.000000092012904, z: -0.000005455195, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: handslot.r
+      parentName: hand.r
+      position: {x: 5.2087756e-10, y: 0.096125245, z: -0.057499886}
+      rotation: {x: -0.000000016437719, y: 0.000000019798906, z: -0.7071068, w: 0.7071067}
+      scale: {x: 1, y: 1, z: 1}
+    - name: head
+      parentName: chest
+      position: {x: 1.17175564e-29, y: 0.26879656, z: -5.51e-43}
+      rotation: {x: -3.5527137e-15, y: -4.2351647e-22, z: 7.504057e-29, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: upperleg.l
+      parentName: hips
+      position: {x: -0.17094506, y: 0.11358726, z: 0.000000013923272}
+      rotation: {x: 0.9998491, y: 0.00000007132811, z: 0.00000001204276, w: 0.017373597}
+      scale: {x: 1, y: 0.99999976, z: 1.0000011}
+    - name: lowerleg.l
+      parentName: upperleg.l
+      position: {x: -0.000000017618165, y: 0.22707745, z: -0.0000000026764533}
+      rotation: {x: 0.10622619, y: -0.00000006865233, z: 0.00000007377126, w: 0.994342}
+      scale: {x: 1, y: 0.9999998, z: 0.99999964}
+    - name: foot.l
+      parentName: lowerleg.l
+      position: {x: 0.0000000031713046, y: 0.14943705, z: 0.000000002732202}
+      rotation: {x: -0.45523942, y: -0.000000016197218, z: 0.000000034355875, w: 0.8903691}
+      scale: {x: 1, y: 1.0000008, z: 0.9999996}
+    - name: toes.l
+      parentName: foot.l
+      position: {x: -1.0546497e-10, y: 0.16565004, z: 0.000000038133127}
+      rotation: {x: -0.000000039980723, y: 0.9203549, z: -0.39108425, w: -0.00000006504238}
+      scale: {x: 1, y: 0.9999977, z: 1.0000033}
+    - name: upperleg.r
+      parentName: hips
+      position: {x: 0.17094506, y: 0.11358726, z: 0.000000013923272}
+      rotation: {x: 0.9998491, y: -0.00000007426621, z: 0.00000003172626, w: 0.017373597}
+      scale: {x: 1, y: 0.99999976, z: 1.0000011}
+    - name: lowerleg.r
+      parentName: upperleg.r
+      position: {x: 0.000000017036612, y: 0.22707745, z: -0.0000000017018253}
+      rotation: {x: 0.10622621, y: 0.000000068652334, z: -0.00000007377127, w: 0.994342}
+      scale: {x: 1, y: 0.9999999, z: 0.9999997}
+    - name: foot.r
+      parentName: lowerleg.r
+      position: {x: -0.0000000054323515, y: 0.14943695, z: 8.426966e-10}
+      rotation: {x: -0.45523942, y: -0.00000015576668, z: 0.000000017729942, w: 0.8903691}
+      scale: {x: 1, y: 1.0000005, z: 0.999999}
+    - name: toes.r
+      parentName: foot.r
+      position: {x: 0.00000001914704, y: 0.16565004, z: -0.00000001019159}
+      rotation: {x: 2.5350583e-10, y: 0.9203549, z: -0.39108425, w: -0.00000008213901}
+      scale: {x: 1, y: 0.9999976, z: 1.0000035}
+    - name: Rogue_LegLeft
+      parentName: Rogue(Clone)
+      position: {x: 0.000002861023, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_LegRight
+      parentName: Rogue(Clone)
+      position: {x: 0.000002861023, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_ArmLeft
+      parentName: Rogue(Clone)
+      position: {x: -0.00000166893, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_ArmRight
+      parentName: Rogue(Clone)
+      position: {x: -0.00000166893, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_Body
+      parentName: Rogue(Clone)
+      position: {x: 0.000002861023, y: 0, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Rogue_Cape
+      parentName: Rogue(Clone)
+      position: {x: 0.0000026226044, y: 1.2158737, z: 0}
+      rotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: root
+    hasTranslationDoF: 0
+    hasExtraRoot: 1
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 1
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Creep/Creep1.prefab

@@ -980,7 +980,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit
   ShowTopMostFoldoutHeaderGroup: 1
   enemyTeam: 2
-  maxHealth: 100
+  maxHealth: 75
   damageEffectPrefab: {fileID: 4021103657954561961, guid: 5c755f9bc5253ea418e919994537dcc7, type: 3}
   destroyEffectPrefab: {fileID: 141433446842962269, guid: 9fe8f8b3288e45a44af36ff8aa04486e, type: 3}
   showHealthBar: 1
@@ -1032,8 +1032,8 @@ MonoBehaviour:
   maxChaseDistance: 30
   chaseGiveUpDistance: 25
   attackRange: 3
-  attackInterval: 1.5
-  attackDamage: 15
+  attackInterval: 2
+  attackDamage: 10
   moveSpeed: 5
   chaseSpeedMultiplier: 1
   showDebugInfo: 1

Assets/Prefabs/Creep/Creep2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1b51c70b826d97d47bb851e2d8ff758f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: