Commit Graph

15909 Commits (de0a84bcc55fb052723958bb92d03423a3226c97)
 

Author SHA1 Message Date
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
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 45bad3690d 免费充值页面 2024-10-10 16:36:55 +08:00
PC-202302260912\Administrator 2978d5e43e 模型替换 2024-10-10 16:08:49 +08:00
PC-202302260912\Administrator 1a6a9d9e96 创建公会页面底图修改 2024-10-10 16:08:02 +08:00
PC-202302260912\Administrator 1b061bc2ef 商店页面图片修改 2024-10-10 16:01:03 +08:00
PC-202302260912\Administrator 0b5c697dbb 抽卡页面修改 2024-10-10 14:00:20 +08:00
PC-202302260912\Administrator a991533842 错误英雄技能修改 2024-10-10 10:30:06 +08:00
PC-202302260912\Administrator 5d28dcda0c 优化页面 2024-10-09 19:52:37 +08:00
PC-202302260912\Administrator 46484359f7 页面优化 2024-10-09 19:39:19 +08:00
PC-202302260912\Administrator 007741fd49 图鉴页面下方图标修改 2024-10-09 18:22:28 +08:00
PC-202302260912\Administrator 365ee67b4e 活动修改 2024-10-09 18:00:38 +08:00
PC-202302260912\Administrator a4f4e0dbed 海贼更换图片 2024-10-09 16:26:36 +08:00
PC-202302260912\Administrator da01c6cb5f 神器修改 竞技场修改 2024-10-09 16:17:47 +08:00
PC-202302260912\Administrator f7aa0a5134 优化页面 2024-10-09 16:02:10 +08:00
PC-202302260912\Administrator df3d081d4c 修改分解页面 2024-10-09 13:26:18 +08:00
PC-202302260912\Administrator fb724b7283 修改英雄技能 2024-10-08 16:20:19 +08:00
PC-202302260912\Administrator a69312a80e 优化英雄获取页面 2024-10-08 15:29:44 +08:00
PC-202302260912\Administrator a40b6c0aa4 寻宝详情 2024-10-08 14:08:38 +08:00
PC-202302260912\Administrator cb4cb171c1 连购好礼页面优化 2024-10-08 14:07:50 +08:00
PC-202302260912\Administrator b5a342110c 添加图片 2024-10-08 14:06:21 +08:00
PC-202302260912\Administrator b7301d38e8 又存了一下 上传 2024-10-08 13:15:07 +08:00
PC-202302260912\Administrator 61b79d39cc 竞技场排行榜页面修改 2024-10-08 13:14:18 +08:00
PC-202302260912\Administrator d0fc3b3faa 英雄页面优化 2024-09-30 14:57:27 +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 3f4f39ab7e 英雄页面修改 2024-09-26 19:33:49 +08:00
PC-202302260912\Administrator e0ad0a1213 聊天页面修改 2024-09-26 18:23:18 +08:00
PC-202302260912\Administrator 6f949f00e4 添加一张图片 2024-09-26 18:21:56 +08:00
PC-202302260912\Administrator cf6b6a6479 添加图标 2024-09-26 18:19:28 +08:00
PC-202302260912\Administrator bebfc8c823 修改页面 2024-09-26 13:41:35 +08:00