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

173 Commits (39a41f45f970b95dfc183409730faa07664f724f)

Author SHA1 Message Date
JieLing a7bd8323ad 【鸿蒙阵】 红点刷新修改 2021-02-20 21:22:05 +08:00
guowei 1e2c5ea7c6 【主城添加鸿蒙碑升级的红点检测】 2021-02-20 15:44:09 +08:00
zhangqiang 1c95b576f0 Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容 
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
 2021-02-19 10:54:36 +08:00
jiaoyangna 0b5b98a77a 【活动需求】勇往直前主题活动（社稷大典） 2021-02-18 10:52:02 +08:00
ZhangBiao 6e56b2862c 【牛转钱坤】增加红点 2021-01-28 15:03:16 +08:00
zhangqiang 122ccb94e2 【优化】主城假人改为NPC或者排行榜角色 2 2021-01-27 17:36:33 +08:00
zhangqiang a126c4ca2a Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-27 16:40:53 +08:00
zhangqiang 7b01f5fc07 【优化】主城假人改为NPC或者排行榜角色 2021-01-27 16:40:17 +08:00
ZhangBiao 78bc7e8ab3 Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤 2021-01-26 13:49:08 +08:00
jiaoyangna 14ba84052d 【ID1008002】 
【活动需求】碧血丹心主题活动（限时兑换-掉落春节道具（鞭炮或者糖葫芦））新增扭转乾坤转盘活动。2月11日~2月17日【ID1008003】
【活动需求】势不可挡主题活动（易经宝库-挖矿活动）2月18日~2月24日【ID1008001】
【活动需求】叱咤风云主题活动（新将来袭-观音）2月4日~2月10日
 2021-01-25 20:34:16 +08:00
ZhangBiao 9e14cada49 【牛转钱坤】完事了 2021-01-21 15:10:27 +08:00
ZhangBiao 20857d4e27 【牛转钱坤】差不多完事了 2021-01-20 18:27:23 +08:00
guowei 6617d818c0 【鸿蒙阵bug修改】 2021-01-20 13:52:53 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
guowei 3f8312953e Merge branch 'master_xma_local' into 0功能/鸿蒙门阵 2021-01-14 10:20:12 +08:00
jiaoyangna 4627e88c2f 主题活动提交 2021-01-12 10:39:41 +08:00
guowei c252f1bae6 【鸿蒙阵修改】 2021-01-09 14:30:35 +08:00
gaoxin 6c1a801779 Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local 2021-01-09 13:54:01 +08:00
gaoxin b4713efce8 【GM】添加批量添加英雄，道具的GM 2021-01-09 13:53:48 +08:00
jiaoyangna d7dfdfcb2e 铜墙铁壁 2021-01-08 19:23:09 +08:00
zhangqiang 54ffbe55fc 【重置优化】将游戏中的各个玩法重置时间统一调整至0点 2021-01-08 19:15:08 +08:00
jiaoyangna 3cecf72861 铜墙铁壁 2021-01-07 16:22:36 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
 2021-01-06 20:05:35 +08:00
guowei d42cbc0a34 【鸿蒙阵bug修改】 2021-01-06 11:16:10 +08:00
guowei 0eae27d30d 【鸿蒙阵bug修改】 2021-01-06 10:03:38 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
 2021-01-05 14:23:00 +08:00
zhangqiang ed65735dc5 【重置优化】将游戏中的各个玩法重置时间统一调整至0点 2021-01-04 14:27:18 +08:00
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local 
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
 2020-12-26 20:22:23 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
jiaoyangna 5a0bece22e 所向披靡修改 2020-12-24 10:23:02 +08:00
guowei 2ac574ff06 【鸿蒙阵bug】更新 2020-12-23 17:41:31 +08:00
ZhangBiao 8801a84c2b 【新将活动】商店跳转修复 2020-12-23 17:28:20 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
 2020-12-23 11:13:48 +08:00
guowei 0454746498 【鸿蒙阵】 2020-12-21 10:08:30 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
guowei f744e609a1 【鸿蒙阵剩余图片】 2020-12-18 16:31:28 +08:00
guowei 4f4542d53a 【鸿蒙阵】 2020-12-18 13:39:35 +08:00
jiaoyangna 9f01de23ea [主题活动] 2020-12-18 11:22:54 +08:00
guowei 52d493ebc7 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级) 
(cherry picked from commit 4ef08d456e)
 2020-12-08 15:05:35 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
DESKTOP-98AVA47\Administrator 15eebe4584 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00