root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,912 Commits
38 Branches
2218 Tags
29 GiB
Commit Graph

131 Commits (82916802c0258c8a8082e6ffb157dab2d17fc419)

Author SHA1 Message Date
zhangjiannan b25ac62235 格式化脚本 2024-09-06 10:38:56 +08:00
DESKTOP-MMO982B\User 66a1580380 本地化 2024-08-29 21:36:51 +08:00
DESKTOP-MMO982B\User 959ebed9fb 本地化资源名以_zh结尾 2024-08-14 15:31:53 +08:00
PC-202302260912\Administrator 61a7e6f224 心魔试炼关卡显示修改 同步常规 2024-05-16 14:50:43 +08:00
PC-202302260912\Administrator 08b4b2d6d0 小兵自动抽提交 2024-04-26 19:21:36 +08:00
PC-202302260912\Administrator 274447d7b5 小兵自动战斗优化提交 2024-04-26 18:20:14 +08:00
PC-202302260912\Administrator bd04bea4c6 小兵添加战力，小兵自动抽卡提交 2024-04-26 18:00:38 +08:00
PC-202302260912\Administrator f9d180ea53 小兵提交 2024-03-29 19:25:56 +08:00
DESKTOP-RH64908\Administrator 67aef02254 奖励字体颜色修改 2024-02-27 19:20:33 +08:00
PC-202302260912\Administrator bc3f82e874 奖励物品展示修改提交 2023-12-06 14:30:19 +08:00
PC-202302260912\Administrator 2987bc24a2 心魔试炼=================屏蔽神应显示 2023-07-14 11:24:26 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +08:00
wangzhenxing 6fe2c64214 获得宝箱修改提交 2023-02-22 10:45:17 +08:00
wangzhenxing 726b53355e 法相背包修改提交 2023-02-19 21:21:45 +08:00
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
yuanshuai 41d594edbc 挑战副本修改优化 2022-11-17 10:48:24 +08:00
yuanshuai 1545823af6 挑战副本修改提交 2022-11-16 14:01:40 +08:00
yuanshuai 5fc4f301c4 挑战副本修改 2022-11-14 11:19:18 +08:00
yuanshuai 08cf1d1ea8 添加重置 2022-09-02 13:15:24 +08:00
wangzhenxing ceefbf5c42 [背包]=====碎片合成按钮显示修改 2022-08-17 17:25:45 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
jiaoyangna 81ca63fc7e 车迟积分修改提交 2022-03-10 18:20:35 +08:00
jiaoyangna 1e39c04f7d 车迟结算界面积分修改提交 2022-03-10 18:17:44 +08:00
ZhangBiao ffbdafd13e 【修行】红点检测 2022-01-17 10:53:06 +08:00
ZhangBiao 98f89d8a9b 【摘星阁+修为】装备属性展示+修为红点检测 2022-01-17 10:44:43 +08:00
ZhangBiao cc3791e0d5 【家园】修改到达上线提示文字、红点修改 2022-01-10 17:24:39 +08:00
ZhangBiao 6b2860c5f4 【命格】获得命石后，有可穿戴入口没红点 2022-01-10 15:38:20 +08:00
ZhangBiao 80b6315905 【降妖夺宝】在活动页面，进入珍奇宝阁购买野球拳，足够10连抽时，10连按钮依然显示妖晶抽取 2021-12-24 14:47:39 +08:00
gaoxin 3a559c912c 【挚礼月卡】月卡功能数据剥离到MonthCardManager 2021-10-18 16:22:11 +08:00
gaoxin 4f9cc3ee44 【奖励界面】部分界面胡乱显示经验调 2021-09-22 20:54:46 +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
ZhangBiao 2925de34e8 【七界试炼】结算界面提交 2021-09-17 14:38:05 +08:00
ZhangBiao 20c122e096 【寻宝迷踪】红点修改 2021-09-16 16:52:22 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
gaoxin b26cbe30ae 【奖励界面】修复部分奖励界面显示异常的问题 2021-09-15 10:24:57 +08:00
ZhangBiao 4eb8e566fe 【七界试炼】战斗结束提交 2021-09-10 18:36:39 +08:00
zhangshanxue 8c277426e5 【奖励】修复关闭界面时部分数据未还原 2021-09-06 13:55:12 +08:00
zhangshanxue 54cae546af Merge branch 'china/test' into china/xq 2021-09-06 11:47:33 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
 2021-08-26 17:42:25 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
 2021-08-25 15:25:54 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
 2021-08-06 11:15:13 +08:00
gaoxin 04c89ccaa9 【月卡】月卡激活提示修改到关闭奖励界面之后 2021-06-19 15:45:13 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
zhangqiang 4bfbd360dd 【山河社稷图】特效层级调整 2021-05-27 23:20:09 +08:00
zhangqiang 0b2ef33938 【山河社稷图】特效修改提交 2021-05-27 20:29:05 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00