Merge branch 'main' of https://burning.i234.me/fgb_ino/nightward

Assets/ResWork/Table/Export/GachaReward.json

@@ -1 +1 @@
-[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "3", "n_RewardMaxCount": "5", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "3", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "97", "n_RewardMinCount": "6", "n_RewardMaxCount": "9", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "2", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "90", "n_RewardMinCount": "10", "n_RewardMaxCount": "15", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "20", "n_RewardMinCount": "3", "n_RewardMaxCount": "3", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "79", "n_RewardMinCount": "16", "n_RewardMaxCount": "25", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "30", "n_RewardMinCount": "4", "n_RewardMaxCount": "5", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "3", "n_RewardMinCount": "2", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "67", "n_RewardMinCount": "26", "n_RewardMaxCount": "40", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "40", "n_RewardMinCount": "6", "n_RewardMaxCount": "8", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "5", "n_RewardMinCount": "3", "n_RewardMaxCount": "4", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "55", "n_RewardMinCount": "41", "n_RewardMaxCount": "80", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "50", "n_RewardMinCount": "9", "n_RewardMaxCount": "12", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "50", "n_RewardMinCount": "5", "n_RewardMaxCount": "8", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "9", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "50", "n_RewardMinCount": "13", "n_RewardMaxCount": "15", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "9", "e_GachaRewardType": "Chat", "n_GachaRate": "50", "n_RewardMinCount": "9", "n_RewardMaxCount": "12", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "9", "e_GachaRewardType": "Gacha", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "0.5"}]
+[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "30", "n_RewardMaxCount": "50", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "3", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "97", "n_RewardMinCount": "60", "n_RewardMaxCount": "90", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "2", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "90", "n_RewardMinCount": "100", "n_RewardMaxCount": "150", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "20", "n_RewardMinCount": "3", "n_RewardMaxCount": "3", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "79", "n_RewardMinCount": "160", "n_RewardMaxCount": "250", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "30", "n_RewardMinCount": "4", "n_RewardMaxCount": "5", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "3", "n_RewardMinCount": "2", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "67", "n_RewardMinCount": "260", "n_RewardMaxCount": "400", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "40", "n_RewardMinCount": "6", "n_RewardMaxCount": "8", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "5", "n_RewardMinCount": "3", "n_RewardMaxCount": "4", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "55", "n_RewardMinCount": "410", "n_RewardMaxCount": "800", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "50", "n_RewardMinCount": "9", "n_RewardMaxCount": "12", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "50", "n_RewardMinCount": "5", "n_RewardMaxCount": "8", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "9", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "50", "n_RewardMinCount": "13", "n_RewardMaxCount": "15", "f_LuckyBonusRate": "3"}, {"n_GachaGrade": "9", "e_GachaRewardType": "Chat", "n_GachaRate": "50", "n_RewardMinCount": "9", "n_RewardMaxCount": "12", "f_LuckyBonusRate": "5"}, {"n_GachaGrade": "9", "e_GachaRewardType": "Gacha", "n_GachaRate": "0", "n_RewardMinCount": "0", "n_RewardMaxCount": "0", "f_LuckyBonusRate": "0.5"}]

Assets/ResWork/Table/Export/Girl.json

@@ -1,49 +1,49 @@
-[{"n_GirlID": "1", "s_Name": "한유진", "s_Profile": "나이: 27세
+[{"n_GirlID": "1", "s_Name": "이서연", "s_Profile": "나이: 24세
-직업 : 카페 알바생
+직급 : 주임 간호사
-키: 164cm
-몸무게: 51kg
-가슴 사이즈: 35in
-허리 사이즈: 24in
-엉덩이 사이즈: 35in", "s_ProfileImage": "Girl/1/Coin/01.png", "s_PersonaId": "SGW_HanYoojin"}, {"n_GirlID": "2", "s_Name": "오유나", "s_Profile": "나이: 26세
-직업 : 인턴 사원
-키: 162cm
-몸무게: 49kg
-가슴 사이즈: 33in
-허리 사이즈: 23in
-엉덩이 사이즈: 33in", "s_ProfileImage": "Girl/2/Coin/01.png", "s_PersonaId": "SGW_OhYuna"}, {"n_GirlID": "3", "s_Name": "강소윤", "s_Profile": "나이: 24세
-직업 : 게임 스트리머
-키: 160cm
-몸무게: 52kg
-가슴 사이즈: 35in
-허리 사이즈: 26in
-엉덩이 사이즈: 36in", "s_ProfileImage": "Girl/3/Coin/01.png", "s_PersonaId": "SGW_KangSoyoon"}, {"n_GirlID": "4", "s_Name": "이지우", "s_Profile": "나이: 29세
-직업 : 국어 교사
 키: 170cm
-몸무게: 54kg
+몸무게: 56kg
-가슴 사이즈: 33in
-허리 사이즈: 24in
-엉덩이 사이즈: 34in", "s_ProfileImage": "Girl/4/Coin/01.png", "s_PersonaId": "SGW_LeeJiwoo"}, {"n_GirlID": "5", "s_Name": "박하영", "s_Profile": "나이: 23세
-직업 : 패션 모델
-키: 172cm
-몸무게: 55kg
 가슴 사이즈: 35in
-허리 사이즈: 23in
+허리 사이즈: 24in
-엉덩이 사이즈: 35in", "s_ProfileImage": "Girl/5/Coin/01.png", "s_PersonaId": "SGW_ParkHayoung"}, {"n_GirlID": "6", "s_Name": "카와시마 노조미", "s_Profile": "나이: 21세
+엉덩이 사이즈: 36in", "s_ProfileImage": "Girl/1/Coin/01.png", "s_PersonaId": "NW_LeeSeoyeon"}, {"n_GirlID": "2", "s_Name": "차도희", "s_Profile": "나이: 22세
-직업 : 미대 유학생
+직업 : 책임 간호사
-키: 158cm
-몸무게: 46kg
-가슴 사이즈: 32in
-허리 사이즈: 22in
-엉덩이 사이즈: 32in", "s_ProfileImage": "Girl/6/Coin/01.png", "s_PersonaId": "SGW_Nozomi"}, {"n_GirlID": "7", "s_Name": "최하린", "s_Profile": "나이: 28세
-직업 : 변호사
 키: 168cm
-몸무게: 53kg
-가슴 사이즈: 33in
-허리 사이즈: 25in
-엉덩이 사이즈: 34in", "s_ProfileImage": "Girl/7/Coin/01.png", "s_PersonaId": "SGW_ChoiHarin"}, {"n_GirlID": "8", "s_Name": "김소영", "s_Profile": "나이: 30세
-직업 : 요리사
-키: 166cm
 몸무게: 52kg
 가슴 사이즈: 34in
+허리 사이즈: 23in
+엉덩이 사이즈: 34in", "s_ProfileImage": "Girl/2/Coin/01.png", "s_PersonaId": "NW_ChaDohee"}, {"n_GirlID": "3", "s_Name": "박하린", "s_Profile": "나이: 21세
+직업 : 신입 간호사
+키: 165cm
+몸무게: 50kg
+가슴 사이즈: 33in
+허리 사이즈: 23in
+엉덩이 사이즈: 34in", "s_ProfileImage": "Girl/3/Coin/01.png", "s_PersonaId": "NW_ParkHarin"}, {"n_GirlID": "4", "s_Name": "강서희", "s_Profile": "나이: 25세
+직업 : 응급실 간호사
+키: 172cm
+몸무게: 58kg
+가슴 사이즈: 36in
 허리 사이즈: 25in
-엉덩이 사이즈: 35in", "s_ProfileImage": "Girl/8/Coin/01.png", "s_PersonaId": "SGW_KimSoyoung"}]
+엉덩이 사이즈: 37in", "s_ProfileImage": "Girl/4/Coin/01.png", "s_PersonaId": "NW_KangSeohee"}, {"n_GirlID": "5", "s_Name": "오민아", "s_Profile": "나이: 20세
+직업 : 간호 실습생
+키: 162cm
+몸무게: 48kg
+가슴 사이즈: 33in
+허리 사이즈: 22in
+엉덩이 사이즈: 34in", "s_ProfileImage": "Girl/5/Coin/01.png", "s_PersonaId": "NW_OhMinah"}, {"n_GirlID": "6", "s_Name": "정유나", "s_Profile": "나이: 26세
+직업 : 선임 간호사
+키: 169cm
+몸무게: 54kg
+가슴 사이즈: 34in
+허리 사이즈: 24in
+엉덩이 사이즈: 35in", "s_ProfileImage": "Girl/6/Coin/01.png", "s_PersonaId": "NW_JungYuna"}, {"n_GirlID": "7", "s_Name": "김예리", "s_Profile": "나이: 27세
+직업 : 수간호사
+키: 171cm
+몸무게: 55kg
+가슴 사이즈: 35in
+허리 사이즈: 24in
+엉덩이 사이즈: 36in", "s_ProfileImage": "Girl/7/Coin/01.png", "s_PersonaId": "NW_KimYeri"}, {"n_GirlID": "8", "s_Name": "신지유", "s_Profile": "나이: 23세
+직업 : 간호 조무사
+키: 167cm
+몸무게: 53kg
+가슴 사이즈: 34in
+허리 사이즈: 24in
+엉덩이 사이즈: 35in", "s_ProfileImage": "Girl/8/Coin/01.png", "s_PersonaId": "NW_ShinJiyu"}]

Assets/ResWork/UI_Image/Girl/girl_08.png.meta

@@ -109,6 +109,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    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:
@@ -147,7 +160,8 @@ TextureImporter:
     secondaryTextures: []
     spriteCustomMetadata:
       entries: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      girl_08_0: 606087153099968982
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 

Assets/Resources/Prefabs/HorseRush/Image/Bubble_GoldedCarrot.png.meta

@@ -109,6 +109,19 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    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:
@@ -147,7 +160,8 @@ TextureImporter:
     secondaryTextures: []
     spriteCustomMetadata:
       entries: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      Bubble_GoldedCarrot_0: 7700500376927275911
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: