Commit Graph

9791 Commits (c57326969574900c83ce7ad98e455dc9c1aa5a16)

Author SHA1 Message Date
PC-202302260912\Administrator c573269695 页面优化 2024-10-21 18:42:21 +08:00
PC-202302260912\Administrator 7abcf61da2 修改礼包购买 2024-10-21 17:42:19 +08:00
zhangjiannan 8091b18371 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-21 14:44:48 +08:00
zhangjiannan 0434c4060f 1 2024-10-21 14:43:59 +08:00
PC-202302260912\Administrator bb9a718ade 优化页面 2024-10-20 14:39:00 +08:00
PC-202302260912\Administrator 00e453f708 优化页面 2024-10-16 17:58:13 +08:00
PC-202302260912\Administrator 700e9be6ec 强者招募券改为招募龙珠 2024-10-16 16:55:42 +08:00
DESKTOP-MMO982B\User 645fa025a8 1 2024-10-17 19:57:06 +08:00
zhangjiannan f5e0ae31d6 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-15 11:57:41 +08:00
zhangjiannan cabdcc8ddf 地图修改 2024-10-15 11:57:20 +08:00
PC-202302260912\Administrator 92782ed852 修改战斗页面 2024-10-14 11:48:06 +08:00
PC-202302260912\Administrator 9d07674d7d 修改页面 2024-10-14 11:34:01 +08:00
zhangjiannan ce0ee8ec33 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-11 19:11:55 +08:00
zhangjiannan 3287d0b938 龙珠修改 2024-10-11 19:11:47 +08:00
PC-202302260912\Administrator 8c0599853e 灵脉页面优化 2024-10-11 18:25:12 +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 67e966f3ab 1 2024-10-11 15:57:22 +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 46484359f7 页面优化 2024-10-09 19:39:19 +08:00
PC-202302260912\Administrator f7aa0a5134 优化页面 2024-10-09 16:02:10 +08:00
PC-202302260912\Administrator 61b79d39cc 竞技场排行榜页面修改 2024-10-08 13:14:18 +08:00
PC-202302260912\Administrator e0ad0a1213 聊天页面修改 2024-09-26 18:23:18 +08:00
PC-202302260912\Administrator 4c58c6be5a 页面优化 2024-09-24 21:10:04 +08:00
PC-202302260912\Administrator 4c10e4cd65 英雄热榜 2024-09-23 19:00:01 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
PC-202302260912\Administrator c860d62433 优化页面 2024-09-18 13:22:59 +08:00
PC-202302260912\Administrator cecc1fda58 预设修改 2024-09-14 13:34:20 +08:00
PC-202302260912\Administrator 913f5891ca 主角等级被遮挡修改 宇宙武道会秘宝修改 2024-09-13 18:46:39 +08:00
PC-202302260912\Administrator 4115268eff 预设修改 2024-09-16 17:20:54 +08:00
PC-202302260912\Administrator 558b10c3f8 变身卡奥义卡修改 礼物预设修改 2024-09-16 15:33:37 +08:00
PC-202302260912\Administrator 56ac16a528 优化页面 点将台修改伙伴招募 2024-09-16 11:55:15 +08:00
PC-202302260912\Administrator e8a1bf84da 推进城 改为宇宙生成挑战 2024-09-12 19:37:04 +08:00
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
PC-202302260912\Administrator a3f36c4cf8 霸气修改为界神技 2024-09-12 18:55:11 +08:00
PC-202302260912\Administrator 0b3cb6df94 生命卡修改为意念 预设修改 2024-09-12 18:34:47 +08:00
PC-202302260912\Administrator 52926012d6 名刀变超级武器 2024-09-12 16:12:17 +08:00
PC-202302260912\Administrator 4ab52a68c5 修改预设titilebg 2024-09-11 21:30:46 +08:00
PC-202302260912\Administrator 64fb5c4140 添加图标修改预设 2024-09-11 21:25:45 +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 dec4c5fe46 优化一部分页面 2024-09-09 21:11:16 +08:00
PC-202302260912\Administrator 78e2e6a8da 圣器改为神龙 2024-09-09 18:03:32 +08:00
PC-202302260912\Administrator 7e7b86d35e 阵营命修改 上传一部分杂乱的mat 2024-09-06 19:30:37 +08:00
PC-202302260912\Administrator 63eb082f63 名望页面替换 2024-08-27 11:05:27 +08:00
PC-202302260912\Administrator 9ad09bc847 首冲好礼图片更改 2024-08-27 10:57:15 +08:00
PC-202302260912\Administrator 4191eee0b0 敌我双方技能显示修改 2024-08-21 20:59:37 +08:00
wangzhenxing 707908f7c2 敌方英雄显示修改 2024-08-21 19:31:26 +08:00
wangzhenxing 66e79476a2 特效播放修改提交 2024-08-21 19:17:35 +08:00
wangzhenxing 4d76c06458 英雄详情界面spine显示修改 2024-08-21 18:55:42 +08:00
PC-202302260912\Administrator 1fa1310e79 我方释放技能修改 2024-08-19 16:39:18 +08:00