Commit Graph

325 Commits (e5699cb8c77c43ca5d5ecd0dc5baf9ae6850c34f)

Author SHA1 Message Date
jiaoyangna e5699cb8c7 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
jiaoyangna 2a0589b1d8 天书秘卷修改提交 2021-04-07 10:58:37 +08:00
ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-04-06 15:51:24 +08:00
ZhangBiao 4c0150b7d9 【十五日登陆】导入特效资源 2021-04-02 16:04:57 +08:00
ZhangBiao d69d96a321 【十五日登陆】红点 2021-04-02 11:53:07 +08:00
ZhangBiao e4122121a4 【十五日登陆】资源提交 2021-04-02 11:23:07 +08:00
jiaoyangna ae17483a8e 灵兽 修改提交 2021-04-01 14:56:47 +08:00
jiaoyangna 0c43f05161 灵兽秘卷修改 2021-03-31 18:00:44 +08:00
ZhangBiao 86425e1c91 【十五日登陆】提交 2021-03-31 15:20:02 +08:00
ZhangBiao 1c2f1d23c0 【十五日登陆】开坑 2021-03-31 15:02:04 +08:00
jiaoyangna 43da7e2d51 十绝阵提交 2021-03-31 14:25:43 +08:00
jiaoyangna b7a0cca0fe 成长基金修改提交 2021-03-30 22:19:54 +08:00
ZhangBiao d4b843d972 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:03:59 +08:00
ZhangBiao 4dcdd67648 【极速探索优化】更改极速探索界面,突出激活探索特权的按钮 2021-03-30 22:01:58 +08:00
jiaoyangna 0494e55215 Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
2021-03-30 20:41:32 +08:00
ZhangBiao d61c55d24d Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 18:55:35 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
zhangqiang aabe3e082f 【归元修改】资源提交 2021-03-30 17:31:44 +08:00
ZhangBiao 289af5b209 【活动优化】青龙秘宝界面优化 2021-03-30 14:34:25 +08:00
jiaoyangna 87e724d19d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2021-03-30 13:48:08 +08:00
jiaoyangna ed1d9a2b1f Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 13:46:49 +08:00
ZhangBiao a0fb7f5714 【天宫寻宝】按钮增加特效 2021-03-30 13:43:46 +08:00
ZhangBiao 32146997e4 【寻宝优化】优化天宫寻宝界面 2021-03-30 11:25:07 +08:00
ZhangBiao 8796bf4957 【福星高照】提交 2021-03-30 10:27:18 +08:00
zhangqiang 76c9760993 Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
2021-03-29 17:56:19 +08:00
ZhangBiao e0d05e175e 【福星高照】提交 2021-03-29 09:52:53 +08:00
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
jiaoyangna 8aa411244e 灵兽秘卷修改提交 2021-03-25 16:21:34 +08:00
ZhangBiao 24fa8c17e2 Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-03-25 11:13:37 +08:00
jiaoyangna f972b1646a 主题活动提交 2021-03-24 18:16:30 +08:00
zhangqiang 4939c4da92 【称号坐骑时装】部分资源提交 2021-03-24 16:31:14 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
ZhangBiao 16a933e530 2021-03-19 15:49:00 +08:00
ZhangBiao 65f994b37b 【牛气冲天】提交 2021-03-19 15:16:49 +08:00
jiaoyangna ec8ff74e61 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-19 15:11:37 +08:00
jiaoyangna beb93b5ed9 天书秘卷 2021-03-19 14:37:24 +08:00
ZhangBiao 04cd0b8599 【限时神装】资源名修改 2021-03-19 14:37:13 +08:00
jiaoyangna 0301617829 图片添加_zh 2021-03-19 14:05:20 +08:00
zhangqiang 6b153fc680 【三张资源替换】 2021-03-18 19:30:54 +08:00
gaoxin 45994e7653 【八日登录】资源替换 2021-03-18 14:29:46 +08:00
jiaoyangna 9f1f204588 主界面提交 2021-03-17 20:43:47 +08:00
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna 0cdd115646 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-16 18:32:52 +08:00
jiaoyangna 147d358e11 天书密卷 2021-03-16 17:37:32 +08:00
ZhangBiao 4528e23541 Merge branch 'china/dev' into 0活动开发聚集地/限时神装 2021-03-16 14:49:47 +08:00
ZhangBiao 5334a7c7da 【首领来袭】 2021-03-13 12:57:31 +08:00
ZhangBiao 24ea537bba Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
2021-03-11 15:15:09 +08:00
jiaoyangna 292069ba5d 活动提交 2021-03-11 10:59:49 +08:00
jiaoyangna 4121f24a27 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2021-03-10 13:50:38 +08:00
JieLing abd4028923 【meta】打包后meta文件上传 2021-03-09 16:04:18 +08:00