Commit Graph

229 Commits (7e80577e6e633a5a7da057fe170fd52e9627574e)

Author SHA1 Message Date
DESKTOP-RH64908\Administrator 8d4c3a2213 1 2025-02-10 20:20:21 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
DESKTOP-RH64908\Administrator a384bda644 差异meta上传 2024-11-08 11:13:44 +08:00
PC-202302260912\Administrator 79461eab1e 英雄替换 2024-10-14 13:41:27 +08:00
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
zhangjiannan d82cdf1bfd Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-10 16:54:17 +08:00
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
PC-202302260912\Administrator a991533842 错误英雄技能修改 2024-10-10 10:30:06 +08:00
PC-202302260912\Administrator fb724b7283 修改英雄技能 2024-10-08 16:20:19 +08:00
PC-202302260912\Administrator 0923e493fc 龟仙人超技能 2024-09-30 12:49:53 +08:00
PC-202302260912\Administrator 7014482f03 10001he 10004 模型修改 2024-09-30 12:10:23 +08:00
PC-202302260912\Administrator 1b4dea6d2a 弗利萨技能特效修改 2024-09-27 11:44:03 +08:00
PC-202302260912\Administrator 3eb56c2615 龟仙人超技能 2024-09-26 20:09:45 +08:00
PC-202302260912\Administrator 4060a85f8f 琪琪技能错误 2024-09-26 20:00:44 +08:00
PC-202302260912\Administrator bebfc8c823 修改页面 2024-09-26 13:41:35 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
DESKTOP-MMO982B\User fac68e88ae Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill/gedoujiaqiqi_skill1.png.meta
2024-09-11 17:12:37 +08:00
PC-202302260912\Administrator 77f090d66f 修改 2024-09-06 20:39:43 +08:00
PC-202302260912\Administrator 6fc6cf19bb 模型上传 2024-08-26 15:37:48 +08:00
PC-202302260912\Administrator ca8bdf85ff 10069技能模型上传 2024-08-23 21:39:31 +08:00
PC-202302260912\Administrator f6545bb0c2 有问题的模型 2024-08-23 18:46:12 +08:00
PC-202302260912\Administrator 44357d9060 剩下的技能上传 2024-08-22 16:07:38 +08:00
PC-202302260912\Administrator b46362ee9c 技能模型提交 2024-08-22 15:56:05 +08:00
DESKTOP-MMO982B\User 1aef223b7b Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Prefabs/Live2d/10002jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10002jn_gx.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/10003jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10003jn_gx.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/10004jn_gx.prefab
#	Assets/ManagedResources/Prefabs/Live2d/10004jn_gx.prefab.meta
#	Assets/ManagedResources/Spine/10004jn_gx.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.atlas.txt.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.png.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx.skel.bytes.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Atlas.asset
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Atlas.asset.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Material.mat
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_Material.mat.meta
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_SkeletonData.asset
#	Assets/ManagedResources/Spine/10004jn_gx/10004jn_gx_SkeletonData.asset.meta
2024-08-27 11:13:18 +08:00
DESKTOP-MMO982B\User 6368dd1dec 技能 2024-08-27 11:07:44 +08:00
PC-202302260912\Administrator dc49c9bc12 龙珠所有模型图片 2024-08-19 19:37:21 +08:00
xiejun e34ed629df 四個新英雄 2024-07-23 13:27:45 +08:00
wangzhenxing 8221afe911 艾尼路修改提交 2024-07-05 17:07:17 +08:00
xiejun a26fc9a4e3 艾尼路 2024-07-08 02:56:20 +08:00
wangzhenxing 944e2412d0 海贼spine资源修改文件夹位置 2024-01-26 15:32:11 +08:00
wangzhenxing f02488801d 删除无用spine 2024-01-24 15:58:37 +08:00
wangzhenxing 768aac9e64 删除无用spine 2024-01-23 01:06:26 +08:00
wangzhenxing e693d90994 删除无用spine 2024-01-23 00:19:08 +08:00
PC-202302260912\Administrator f9722ed4ed 修改模型 2024-01-22 20:31:48 +08:00
wangzhenxing 48f522f6a9 删除我用spine 2024-01-21 18:21:57 +08:00
PC-202302260912\Administrator a71bd7dfdb 新模型和展示立绘 2024-01-25 23:22:03 +08:00
wangzhenxing 3620a3aed7 删除英雄spine文件 2024-01-19 17:57:39 +08:00
PC-202302260912\Administrator fcbb5eb359 新增模型 2024-01-17 22:42:33 +08:00
PC-202302260912\Administrator b40081b671 修改两个例会错误 2024-01-16 17:03:50 +08:00
PC-202302260912\Administrator a2a4c8f61f 新模型 2024-01-16 14:25:34 +08:00
PC-202302260912\Administrator 1f9c0f2457 传一批图标 2024-01-11 21:21:30 +08:00
PC-202302260912\Administrator 465841ea1c 大熊和多弗 2024-01-10 10:46:20 +08:00
PC-202302260912\Administrator 1bdd924c8f 大熊相关 2024-01-10 10:45:06 +08:00
PC-202302260912\Administrator 4a5c531cad 多福朗明哥和大熊 2024-01-10 10:43:15 +08:00
PC-202302260912\Administrator ef17946fe8 罗杰和凯多相关上传 2024-01-09 15:16:13 +08:00
PC-202302260912\Administrator 1254a0a8f6 斯摩格相关 2023-12-29 22:28:46 +08:00
PC-202302260912\Administrator 8c942d1127 凯多相关技能修改 2023-12-29 21:49:09 +08:00
xiejun 56be2d2498 文字 2023-12-29 18:07:20 +08:00
PC-202302260912\Administrator da44d9ffdf 相关模型 2023-12-28 21:59:23 +08:00
PC-202302260912\Administrator fd641b336a 罗布路奇 凯多 女帝 2023-12-27 15:39:52 +08:00