Commit Graph

15594 Commits (0f85990a11b71f23534f61a5a7e330cc07ea7a8c)
 

Author SHA1 Message Date
zhangjiannan 0f85990a11 1 2024-10-24 16:18:14 +08:00
zhangjiannan 37afbae4a5 1 2024-10-24 16:14:19 +08:00
zhangjiannan 3284ebabdd Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-24 15:32:57 +08:00
zhangjiannan c3f6ca697b 1 2024-10-24 15:32:47 +08:00
PC-202302260912\Administrator e59c2bd678 聊天背景上传 2024-10-24 15:31:29 +08:00
PC-202302260912\Administrator e33adf73b4 漏传的图片 2024-10-24 15:26:07 +08:00
PC-202302260912\Administrator db97daa792 龙珠相关上传 2024-10-24 14:53:28 +08:00
PC-202302260912\Administrator bbdf50dfc5 页面上有山河设计图修改 2024-10-21 19:29:28 +08:00
PC-202302260912\Administrator 959ffb9a23 图标错误修改 2024-10-21 19:23:47 +08:00
PC-202302260912\Administrator c573269695 页面优化 2024-10-21 18:42:21 +08:00
PC-202302260912\Administrator c40fce4320 奖励页面修改 2024-10-21 17:43:00 +08:00
PC-202302260912\Administrator 7abcf61da2 修改礼包购买 2024-10-21 17:42:19 +08:00
PC-202302260912\Administrator ee44f8c130 修改等级提升页面 2024-10-21 17:32:56 +08:00
PC-202302260912\Administrator 571a67b46f 修改页面 2024-10-21 17:22:02 +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 5ed0ffef6a 临时修改一些跳转 2024-10-20 14:53:14 +08:00
PC-202302260912\Administrator bb9a718ade 优化页面 2024-10-20 14:39:00 +08:00
PC-202302260912\Administrator 378caf644c 优化页面 2024-10-16 19:20:17 +08:00
PC-202302260912\Administrator b0446ff78c 灵脉修改 2024-10-16 18:43:10 +08:00
PC-202302260912\Administrator b5f218794b 天书密卷 2024-10-16 18:38:21 +08:00
PC-202302260912\Administrator b42652e9cd 优化页面 2024-10-16 18:27:30 +08:00
PC-202302260912\Administrator 182954e571 鸿蒙杯 2024-10-16 18:19:44 +08:00
PC-202302260912\Administrator 666d7fc81f 命格页面修改 2024-10-16 18:17:36 +08:00
PC-202302260912\Administrator d39de6cc09 修改礼物预设 2024-10-16 18:02:44 +08:00
PC-202302260912\Administrator 00e453f708 优化页面 2024-10-16 17:58:13 +08:00
PC-202302260912\Administrator e8788d9a4e 更换图片 2024-10-16 17:33:16 +08:00
PC-202302260912\Administrator 7f30d9298a 联购页面下方显示错误 2024-10-16 17:22:07 +08:00
PC-202302260912\Administrator b89fe45329 优化页面 2024-10-16 16:59:27 +08:00
PC-202302260912\Administrator 700e9be6ec 强者招募券改为招募龙珠 2024-10-16 16:55:42 +08:00
PC-202302260912\Administrator 438ab3edf5 优化页面 2024-10-16 16:26: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 9dd81f082d 鸿蒙塔相关 还有其余一些零碎修改 2024-10-14 17:34:32 +08:00
PC-202302260912\Administrator 3d9fb78989 战斗页面缺少的图 2024-10-14 14:16:49 +08:00
PC-202302260912\Administrator 91d3f61fbd 商店遗漏图片上传 2024-10-14 14:05:10 +08:00
PC-202302260912\Administrator 5db7e33db2 图片上传 2024-10-14 13:59:59 +08:00
PC-202302260912\Administrator 79461eab1e 英雄替换 2024-10-14 13:41:27 +08:00
PC-202302260912\Administrator 55c174594f 替换两张loading图 2024-10-14 13:33:42 +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 2d15043e01 七界页面上传 2024-10-11 18:32:15 +08:00
PC-202302260912\Administrator 8c0599853e 灵脉页面优化 2024-10-11 18:25:12 +08:00
PC-202302260912\Administrator 13028d37d4 修改图片 2024-10-11 17:58:34 +08:00
PC-202302260912\Administrator 194d935bd7 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/BG/UI/1All/X1_shouzha_beijing_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_liebiao_07.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_yindao_duihuakuang_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_zhuangbei_pinzhidi.png.meta
2024-10-11 17:09:33 +08:00
PC-202302260912\Administrator b60c878050 冲突图片修改 2024-10-11 17:03:08 +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