Commit Graph

520 Commits (90d1971b254ac35f90c9d69fca4485b66f284b96)

Author SHA1 Message Date
jiaoyangna 57b0689de6 【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
2021-12-30 18:06:36 +08:00
jiaoyangna f0a4cec767 【ID1010975】
【优化】超值返利每日首次登陆有红点提示
2021-12-29 17:10:48 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
ZhangBiao f4b2a09f08 【商城界面】和信任商城 2021-12-17 12:08:15 +08:00
ZhangBiao 45241e1d5d 【商城界面】提交 2021-12-17 11:28:37 +08:00
ZhangBiao 5393485f65 【商城界面】提交 2021-12-16 19:22:46 +08:00
ZhangBiao b203711459 Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-16 17:17:16 +08:00
ZhangBiao c915a3b9eb 【协议】提交 2021-12-16 17:00:47 +08:00
ZhangBiao 68d6e39882 【协议】提交 2021-12-16 16:58:20 +08:00
ZhangBiao e9954f49f2 【商城界面】提交 2021-12-16 11:59:18 +08:00
ZhangBiao 2858f2e400 【商城界面】提交 2021-12-16 10:46:11 +08:00
gaoxin 8d644dd080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-25 07:58:52 +08:00
gaoxin 973eee4b30 【物品】添加新物品类型 2021-12-25 07:58:30 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao 0b9bd476dd Merge branch 'china/dev' into 0功能/命格 2021-12-13 17:26:43 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
gaoxin 3835273079 【关卡】条件新增 2021-12-10 17:37:07 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +08:00
ZhangBiao bab62f274c 【命格】提交 2021-12-10 11:01:44 +08:00
ZhangBiao cb5cf43089 【命格】提交 2021-12-09 20:17:37 +08:00
ZhangBiao 655021fe3f 【命格】战力升降显示 2021-12-08 18:21:28 +08:00
ZhangBiao 1efc9fc56b 【命格】命石穿戴 2021-12-08 09:29:08 +08:00
ZhangBiao 2a68523d05 【命格】提交 2021-12-07 17:19:07 +08:00
ZhangBiao 9509fc7012 【命格】提交 2021-12-07 16:27:55 +08:00
ZhangBiao 464ab967ef 【命格】提交 2021-12-07 15:57:33 +08:00
ZhangBiao eb1a9f29e5 【命格】测试按钮提交 2021-12-07 15:40:36 +08:00
ZhangBiao 3ad898f8af 【命格】提交 2021-12-07 11:50:03 +08:00
jiaoyangna ab722baa35 变身卡修改提交 2021-12-06 14:05:43 +08:00
ZhangBiao 4d1799a124 【连购礼包】提交 2021-12-02 17:13:33 +08:00
ZhangBiao 239d5bbb36 【log】日志调整 2021-11-30 11:19:28 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
jiaoyangna 2212df06ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 11:39:24 +08:00
jiaoyangna 1e17151d7f Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-11-26 11:35:57 +08:00
jiaoyangna 34949242a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-11-25 18:57:48 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
jiaoyangna a248330241 Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
2021-11-25 16:10:14 +08:00
gaoxin 458b7b2ca5 【灵兽】升级时,没有战斗力变化提示 2021-11-25 16:03:41 +08:00
jiaoyangna da218cfc3c 添加战力 2021-11-22 15:02:42 +08:00
jiaoyangna db0fcea43e Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.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/Net/NetManager.lua
2021-11-19 18:01:59 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
ZhangBiao c994c9e636 【灵脉秘境】提交 2021-11-18 18:43:22 +08:00
ZhangBiao 7d0a24a3cc 【灵脉秘境】提交 2021-11-18 17:15:16 +08:00
ZhangBiao 015341b7a6 【灵脉秘境】提交 2021-11-18 15:49:39 +08:00
ZhangBiao 79d2113bc2 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
jiaoyangna 4d887421ea 身外化身提交 2021-11-18 11:55:26 +08:00
jiaoyangna ec48fa55f0 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-11-16 17:34:22 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
jiaoyangna aa6a031fdf 法宝聚灵提交 2021-11-16 09:33:10 +08:00