Commit Graph

177 Commits (1326f2af44a229109d9323cb8c42840f4fa7d50e)

Author SHA1 Message Date
PC-202302260912\Administrator 884acb8d69 1 2025-07-31 16:04:23 +08:00
DESKTOP-MMO982B\User f267a0254c 1 2025-06-17 13:36:51 +08:00
zhangjiannan a5f5894185 1 2024-11-12 16:22:23 +08:00
PC-202302260912\Administrator db97daa792 龙珠相关上传 2024-10-24 14:53:28 +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
PC-202302260912\Administrator 971ba9b2a5 替换文字 2024-09-12 19:29:03 +08:00
wangzhenxing 0d5d64dd04 罗浮争锋修改提交================== 2024-06-18 14:27:45 +08:00
wangzhenxing c54db3a41e 适配提交 2024-02-28 19:28:41 +08:00
wangzhenxing 30cb7595b9 排行榜修改提交 2024-02-06 19:02:38 +08:00
wangzhenxing 76cd9f8354 新竞技场提交 2024-02-05 19:00:08 +08:00
xiejun 7f7041dc3d 伟大航线 2024-01-19 15:26:25 +08:00
wangzhenxing 45afafba01 排行榜备战界面修改 2023-11-11 18:05:39 +08:00
xiejun bb83290058 排行榜UI 2023-10-16 16:16:02 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
xiejun 88740201b3 排行榜UI 2023-09-20 18:00:40 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
wangzhenxing 614ec0b6e1 多队塔排行榜显示修改提交 2023-03-22 10:45:26 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00
wangzhenxing 4a411833a5 多队塔提交 2023-03-20 11:22:44 +08:00
wangzhenxing a5f0dac30a [排行榜]======主程排行榜红点修改 2022-06-20 17:22:11 +08:00
wangzhenxing 91bf4423f9 [主程排行榜]======排行榜红点,列表显示修改 2022-06-20 15:14:35 +08:00
wangzhenxing a2cab243fc 【专属升星】======选择英雄界面报错修改 2022-05-26 11:14:13 +08:00
wangzhenxing 4a4ea1c784 【排行榜】=======关卡排行改山河设计图星星排行报错修改 2022-05-18 14:52:58 +08:00
yuanshuai 732f92a6fa 跨服排行榜页签修改 2022-04-26 17:48:46 +08:00
yuanshuai 55833325bf 跨服相关修改 2022-04-25 17:57:31 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
张彪 1ae90cb549 【战力冲刺】修改提交 2022-02-24 18:19:39 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
ZhangBiao f79de8970c 【灵脉秘境】提交 2021-11-18 15:45:21 +08:00
ZhangBiao 790fe1c88f 【灵脉秘境】提交 2021-11-17 18:28:59 +08:00
jiaoyangna 6e294df15a 删除log 2021-11-11 16:07:33 +08:00
ZhangBiao 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
gaoxin 34a58a310c 【排行榜】修复膜拜后页签红点刷新不及时,修复跨服前七天跨服按钮会显示红点 2021-10-21 17:02:05 +08:00
gaoxin 11d5f735c7 【七界试炼】排行榜删除切磋和加入黑名单按钮 2021-10-18 21:06:01 +08:00
jiaoyangna f31f62ec09 排行榜上小人方向修改 2021-10-15 11:51:38 +08:00
jiaoyangna 851bd2450c 排行榜上小人朝侧面修改提交 2021-10-15 11:40:01 +08:00
wangzhenxing 36d542ba9d 玉虚论道优化提交 2021-09-30 15:12:02 +08:00
wangzhenxing d45abf6fcf Merge branch 'china/dev' into 0功能/玉虚论道 2021-09-28 15:54:33 +08:00
wangzhenxing e42540ade8 排行榜修改提交 2021-09-28 10:29:33 +08:00
ZhangBiao a8c9c836a9 【排行榜】膜拜转圈儿修复 2021-09-27 17:46:40 +08:00
gaoxin 59311a8d88 【跨服】算错了跨服前七天的事件 2021-09-26 15:02:33 +08:00
ZhangBiao 9b24649f36 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 16:08:13 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
gaoxin 1e011b560a 【跨服】开服前七天无法进入跨服 2021-09-23 15:52:01 +08:00
ZhangBiao 016f0159e5 【七界试炼】提交 2021-09-23 14:51:04 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00