Commit Graph

120 Commits (91ace072a26955372ad934d12744a6763ae6aefa)

Author SHA1 Message Date
gaoxin 8558152b29 【立绘】东华帝君,孟婆立绘回归 2022-03-02 19:00:38 +08:00
wangzhenxing d03215cc16 [资源]========神菩提提交
(cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e)
2022-02-17 10:40:12 +08:00
wangzhenxing d7749de932 【资源】======女儿国王 申公豹spine修改 2021-12-27 15:45:21 +08:00
wangzhenxing c7c6889e27 [资源]============虎年坐骑修改提交 2021-12-24 14:06:50 +08:00
wangzhenxing b7bfc1d867 【资源】======虎年坐骑提交 2021-12-22 16:15:51 +08:00
wangzhenxing a7dac651c6 [资源]=======罗刹spine修改 2021-12-22 16:14:42 +08:00
wangzhenxing 9c07c341e5 【资源】===嫦娥新动作提交 2021-12-17 15:08:30 +08:00
ZhangBiao 0d11371d87 【资源冲突】资源名修改提交 2021-12-06 16:15:24 +08:00
ZhangBiao 0b5575c6f2 Merge branch 'china/dev' into china/dev_res
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
#	Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
2021-12-02 14:39:03 +08:00
gaoxin 6c6ce74081 【立绘】伏羲立绘删除脚下的阵 2021-11-29 13:20:45 +08:00
gaoxin 2b642464a5 【立绘】伏羲立绘删除脚下的阵 2021-11-29 13:19:29 +08:00
gaoxin 13ed0776b6 Merge branch 'china/dev' into china/dev_res
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/Spine/c_0023_02/c_0023_02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
2021-11-23 11:35:33 +08:00
wangzhenxing 1361867887 【坐骑】=======四不像提交 2021-11-16 13:31:28 +08:00
gaoxin 3131ffca2f 【资源和谐】后台控制完成 2021-11-09 10:49:37 +08:00
gaoxin 67da83d8b3 【资源】新和谐资源上传 2021-11-09 10:28:18 +08:00
gaoxin aba3d59a04 【资源】新和谐资源上传 2021-11-08 15:27:17 +08:00
gaoxin 563cb97fa9 Merge branch 'china/dev' into china/dev_res
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim
#	Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Materials.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Prefab.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Textures.meta
#	Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png
#	Assets/ManagedResources/Icon/Item/c_zuoqi_qilin.png
#	Assets/ManagedResources/Icon/Item/icon_zuoqi02.png
2021-11-08 15:20:43 +08:00
gaoxin 0ad86bba92 【坐骑】牛哥资源优化 2021-11-01 17:18:32 +08:00
gaoxin 8a7b7c0ca3 【立绘】修复九尾狐动画闪烁的问题 2021-11-01 14:10:31 +08:00
gaoxin 2a63f6158f 【立绘】修复九尾狐动画闪烁的问题 2021-11-01 14:09:44 +08:00
gaoxin 4e68982a6a 【坐骑】新增九尾狐坐骑资源 2021-11-01 11:59:31 +08:00
gaoxin bf6c9c3d75 【坐骑】新增九尾狐坐骑资源 2021-11-01 11:58:50 +08:00
gaoxin aa7c9408ed 【立绘】精卫和谐资源优化 2021-11-01 10:20:03 +08:00
gaoxin 5a2d7abbfa 【立绘】牛哥立绘压缩格式修改 2021-10-29 18:45:36 +08:00
gaoxin 49437e8a25 【立绘】精卫提审资源精修 2021-10-29 17:55:08 +08:00
jiaoyangna 53e664c775 敖丙立绘提交 2021-10-29 17:47:58 +08:00
gaoxin bba1b58ca2 【皮肤】牛魔王,燃灯live2d导入 2021-10-25 13:44:51 +08:00
jiaoyangna dafa14ffb0 坐骑资源修改提交 2021-10-15 13:44:49 +08:00
jiaoyangna b886c7024c 坐骑资源提交 2021-10-14 18:15:07 +08:00
jiaoyangna 8b4f447466 坐骑立绘提交 2021-10-14 12:15:20 +08:00
jiaoyangna 066ecb8f52 敖丙立绘提交 2021-10-08 17:33:37 +08:00
gaoxin 00db8bf660 【资源】女儿国王皮肤资源上传 2021-09-24 14:52:58 +08:00
gaoxin 8fd74e7e99 【资源】坐骑麒麟live2d上传 2021-09-24 12:40:35 +08:00
gaoxin 4e53eb93eb 【资源】坐骑麒麟live2d上传 2021-09-23 14:16:40 +08:00
gaoxin c87cbac163 【资源】女儿国王皮肤资源上传 2021-09-14 15:19:36 +08:00
gaoxin 2fa2fe0a28 【织女】live2d资源没有透明通道 2021-09-07 18:26:43 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
gaoxin eed381315d 【提审】添加石矶提审服资源 2021-08-28 15:04:13 +08:00
gaoxin a3f9967651 【提审服】精卫穿秋裤,慈航穿棉袄 2021-08-27 15:23:03 +08:00
jiaoyangna f50caf3ff5 清理空文件夹 2021-07-29 11:28:30 +08:00
jiaoyangna dd076dfb6a 立绘删除 2021-07-29 11:25:36 +08:00
gaoxin f2d8eec607 【资源】玉皇大帝皮肤资源优化 2021-06-21 16:27:15 +08:00
gaoxin 01e033ad00 【资源】玉皇大帝皮肤资源 2021-06-21 15:14:02 +08:00
gaoxin a61cd973b6 【立绘】优化 2021-06-02 21:40:22 +08:00
gaoxin 23fb18745f 【立绘】资源优化 2021-06-02 21:14:24 +08:00
gaoxin 1856d1003b 【立绘】精卫立绘修改 2021-06-02 20:52:54 +08:00
gaoxin 5a849e7b17 【资源】立绘0043修改 2021-06-02 19:46:46 +08:00
gaoxin c398659223 【立绘】精卫重做,地藏,迦楼罗,灵猫,罗刹,吕洞宾,木吒,改宽度,提交; 2021-06-02 17:45:52 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
gaoxin f67e673401 【资源】立绘提交 2021-05-20 10:19:09 +08:00